Commit a611fb75 authored Jul 02, 2015 by Linus Torvalds

linux

Pull init.h/module.h fragility fixes from Paul Gortmaker:
 "Fixup various init.h misuses that are fragile wrt code moving to
  module.h

  What started as a removal of no longer required include <linux/init.h>
  due to the earlier __cpuinit and __devinit removal led to the
  observation that some module specfic support was living in init.h
  itself, thus preventing the full removal from introducing compile
  regressions.

  This series includes a few final fixups needed prior to the relocation
  of the modular init code from <init.h> to <module.h>.  These are
  things that weren't easily categorized into any of the other previous
  series categories already requested for pull.

  That said, each fixup branch (including this one) is independent and
  there are no ordering constraints.  Only the final code relocation
  (which is NOT in this pull) requires that all my cleanup branches be
  merged first"

* tag 'module-misc-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
  tile: add init.h to usb.c to avoid compile failure
  arm: fix implicit #include <linux/init.h> in entry asm.
  x86: replace __init_or_module with __init in non-modular vsmp_64.c

parents 75462c8a 32e805e7

arch/arm/kernel/entry-armv.S

+2 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		* that causes it to save wrong values... Be aware!
		*/

		#include <linux/init.h>

		#include <asm/assembler.h>
		#include <asm/memory.h>
		#include <asm/glue-df.h>

arch/tile/kernel/usb.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include <linux/dma-mapping.h>
		#include <linux/platform_device.h>
		#include <linux/usb/tilegx.h>
		#include <linux/init.h>
		#include <linux/types.h>

		static u64 ehci_dmamask = DMA_BIT_MASK(32);

arch/x86/kernel/vsmp_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ asmlinkage __visible void vsmp_irq_enable(void)
		}
		PV_CALLEE_SAVE_REGS_THUNK(vsmp_irq_enable);

		static unsigned __init_or_module vsmp_patch(u8 type, u16 clobbers, void *ibuf,
		static unsigned __init vsmp_patch(u8 type, u16 clobbers, void *ibuf,
		unsigned long addr, unsigned len)
		{
		switch (type) {

Admin message