Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e25a2d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc: Fix for getting CPU number in power_save_ppc32_restore()
  powerpc: Fix build error with 64K pages and !hugetlbfs
  powerpc: Work around gcc's -fno-omit-frame-pointer bug
  powerpc: Make sure _etext is after all kernel text
  powerpc: Only make kernel text pages of linear mapping executable
  powerpc: Fix uninitialised variable in VSX alignment code
parents 316343e2 7888bc2b

arch/powerpc/Makefile

+5 −0
Original line number Original line Diff line number Diff line
@@ -116,6 +116,11 @@ ifeq ($(CONFIG_6xx),y) 
KBUILD_CFLAGS		+= -mcpu=powerpc

KBUILD_CFLAGS		+= -mcpu=powerpc

endif

endif





# Work around a gcc code-gen bug with -fno-omit-frame-pointer.

ifeq ($(CONFIG_FTRACE),y)

KBUILD_CFLAGS		+= -mno-sched-epilog

endif



cpu-as-$(CONFIG_4xx)		+= -Wa,-m405

cpu-as-$(CONFIG_4xx)		+= -Wa,-m405

cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec

cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec

cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec

cpu-as-$(CONFIG_POWER4)		+= -Wa,-maltivec

arch/powerpc/include/asm/pgtable-ppc64.h

+2 −4
Original line number Original line Diff line number Diff line
@@ -153,12 +153,10 @@ 
#define __S110	PAGE_SHARED_X

#define __S110	PAGE_SHARED_X

#define __S111	PAGE_SHARED_X

#define __S111	PAGE_SHARED_X





#ifdef CONFIG_HUGETLB_PAGE

#ifdef CONFIG_PPC_MM_SLICES



#define HAVE_ARCH_UNMAPPED_AREA

#define HAVE_ARCH_UNMAPPED_AREA

#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN

#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN



#endif /* CONFIG_PPC_MM_SLICES */

#endif





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__

arch/powerpc/kernel/Makefile

+4 −3
Original line number Original line Diff line number Diff line
@@ -14,12 +14,13 @@ endif 




ifdef CONFIG_FTRACE

ifdef CONFIG_FTRACE

# Do not trace early boot code

# Do not trace early boot code

CFLAGS_REMOVE_cputable.o = -pg

CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog

CFLAGS_REMOVE_prom_init.o = -pg

CFLAGS_REMOVE_prom_init.o = -pg -mno-sched-epilog

CFLAGS_REMOVE_btext.o = -pg -mno-sched-epilog





ifdef CONFIG_DYNAMIC_FTRACE

ifdef CONFIG_DYNAMIC_FTRACE

# dynamic ftrace setup.

# dynamic ftrace setup.

CFLAGS_REMOVE_ftrace.o = -pg

CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog

endif

endif





endif

endif

arch/powerpc/kernel/align.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -647,7 +647,7 @@ static int emulate_vsx(unsigned char __user *addr, unsigned int reg, 
		       unsigned int flags, unsigned int length)

		       unsigned int flags, unsigned int length)

{

{

	char *ptr = (char *) &current->thread.TS_FPR(reg);

	char *ptr = (char *) &current->thread.TS_FPR(reg);

	int ret;

	int ret = 0;





	flush_vsx_to_thread(current);

	flush_vsx_to_thread(current);

arch/powerpc/kernel/idle_6xx.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -158,7 +158,7 @@ _GLOBAL(power_save_ppc32_restore) 
	stw	r9,_NIP(r11)		/* make it do a blr */

	stw	r9,_NIP(r11)		/* make it do a blr */





#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	mfspr	r12,SPRN_SPRG3

	rlwinm	r12,r11,0,0,31-THREAD_SHIFT

	lwz	r11,TI_CPU(r12)		/* get cpu number * 4 */

	lwz	r11,TI_CPU(r12)		/* get cpu number * 4 */

	slwi	r11,r11,2

	slwi	r11,r11,2

#else

#else