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

Commit 7110879c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus' of... 

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  m32r: fix build due to notify_cpu_starting() change
  powerpc: fix linux-next build failure
parents 99ebcf82 3baf63a5

arch/m32r/kernel/smpboot.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
 */



#include <linux/module.h>

#include <linux/cpu.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/mm.h>

arch/powerpc/include/asm/page.h

+5 −1
Original line number Diff line number Diff line
@@ -10,9 +10,13 @@ 
 * 2 of the License, or (at your option) any later version.

 */



#ifndef __ASSEMBLY__

#include <linux/types.h>

#else

#include <asm/types.h>

#endif

#include <asm/asm-compat.h>

#include <asm/kdump.h>

#include <asm/types.h>



/*

 * On PPC32 page size is 4K. For PPC64 we support either 4K or 64K software