powerpc/64: make buildable without CONFIG_COMPAT (0a7601b6) · Commits · 戴 / test

arch/powerpc/include/asm/thread_info.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -162,10 +162,10 @@ static inline bool test_thread_local_flags(unsigned int flags)
		return (ti->local_flags & flags) != 0;
		}

		#ifdef CONFIG_PPC64
		#ifdef CONFIG_COMPAT
		#define is_32bit_task() (test_thread_flag(TIF_32BIT))
		#else
		#define is_32bit_task() (1)
		#define is_32bit_task() (IS_ENABLED(CONFIG_PPC32))
		#endif

		#if defined(CONFIG_PPC64)

+3 −2

Original line number	Diff line number	Diff line
		@@ -40,16 +40,17 @@ CFLAGS_btext.o += -DDISABLE_BRANCH_PROFILING
		endif

		obj-y := cputable.o syscalls.o \
		irq.o align.o signal_32.o pmc.o vdso.o \
		irq.o align.o signal_$(BITS).o pmc.o vdso.o \
		process.o systbl.o idle.o \
		signal.o sysfs.o cacheinfo.o time.o \
		prom.o traps.o setup-common.o \
		udbg.o misc.o io.o misc_$(BITS).o \
		of_platform.o prom_parse.o
		obj-y += ptrace/
		obj-$(CONFIG_PPC64) += setup_64.o sys_ppc32.o signal_64.o \
		obj-$(CONFIG_PPC64) += setup_64.o \
		paca.o nvram_64.o firmware.o note.o \
		syscall_64.o
		obj-$(CONFIG_COMPAT) += sys_ppc32.o signal_32.o
		obj-$(CONFIG_VDSO32) += vdso32/
		obj-$(CONFIG_PPC_WATCHDOG) += watchdog.o
		obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o

+2 −0

Original line number	Diff line number	Diff line
		@@ -52,8 +52,10 @@
		SYS_CALL_TABLE:
		.tc sys_call_table[TC],sys_call_table

		#ifdef CONFIG_COMPAT
		COMPAT_SYS_CALL_TABLE:
		.tc compat_sys_call_table[TC],compat_sys_call_table
		#endif

		/* This value is used to mark exception frames on the stack. */
		exception_marker:

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		CFLAGS_ptrace-view.o += -DUTS_MACHINE='"$(UTS_MACHINE)"'

		obj-y += ptrace.o ptrace-view.o
		obj-$(CONFIG_PPC64) += ptrace32.o
		obj-$(CONFIG_COMPAT) += ptrace32.o
		obj-$(CONFIG_VSX) += ptrace-vsx.o
		ifneq ($(CONFIG_VSX),y)
		obj-y += ptrace-novsx.o

+1 −2

Original line number	Diff line number	Diff line
		@@ -247,7 +247,6 @@ static void do_signal(struct task_struct *tsk)
		sigset_t *oldset = sigmask_to_save();
		struct ksignal ksig = { .sig = 0 };
		int ret;
		int is32 = is_32bit_task();

		BUG_ON(tsk != current);

		@@ -277,7 +276,7 @@ static void do_signal(struct task_struct *tsk)

		rseq_signal_deliver(&ksig, tsk->thread.regs);

		if (is32) {
		if (is_32bit_task()) {
		if (ksig.ka.sa.sa_flags & SA_SIGINFO)
		ret = handle_rt_signal32(&ksig, oldset, tsk);
		else