Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 33d46f976590 · 2015-11-03T19:34:22.000-08:00
Pull x86 cleanups from Ingo Molnar:
 "An early_printk cleanup plus deinlining enhancements"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/early_printk: Set __iomem address space for IO
  x86/signal: Deinline get_sigframe, save 240 bytes
  x86: Deinline early_console_register, save 403 bytes
  x86/e820: Deinline e820_type_to_string, save 126 bytes
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
@@ -911,7 +911,7 @@ void __init finish_e820_parsing(void)
 	}
 }
 
-static inline const char *e820_type_to_string(int e820_type)
+static const char *e820_type_to_string(int e820_type)
 {
 	switch (e820_type) {
 	case E820_RESERVED_KERN:
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
@@ -195,14 +195,14 @@ static __init void early_serial_init(char *s)
 #ifdef CONFIG_PCI
 static void mem32_serial_out(unsigned long addr, int offset, int value)
 {
-	u32 *vaddr = (u32 *)addr;
+	u32 __iomem *vaddr = (u32 __iomem *)addr;
 	/* shift implied by pointer type */
 	writel(value, vaddr + offset);
 }
 
 static unsigned int mem32_serial_in(unsigned long addr, int offset)
 {
-	u32 *vaddr = (u32 *)addr;
+	u32 __iomem *vaddr = (u32 __iomem *)addr;
 	/* shift implied by pointer type */
 	return readl(vaddr + offset);
 }
@@ -316,7 +316,7 @@ static struct console early_serial_console = {
 	.index =	-1,
 };
 
-static inline void early_console_register(struct console *con, int keep_early)
+static void early_console_register(struct console *con, int keep_early)
 {
 	if (con->index != -1) {
 		printk(KERN_CRIT "ERROR: earlyprintk= %s already used\n",
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
@@ -196,7 +196,7 @@ static unsigned long align_sigframe(unsigned long sp)
 	return sp;
 }
 
-static inline void __user *
+static void __user *
 get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
 	     void __user **fpstate)
 {

Original file line number	Diff line number	Diff line change
`@@ -911,7 +911,7 @@ void __init finish_e820_parsing(void)`
`911`	`911`	`}`
`912`	`912`	`}`
`913`	`913`
`914`		`-static inline const char *e820_type_to_string(int e820_type)`
	`914`	`+static const char *e820_type_to_string(int e820_type)`
`915`	`915`	`{`
`916`	`916`	`switch (e820_type) {`
`917`	`917`	`case E820_RESERVED_KERN:`
Original file line number	Diff line number	Diff line change
`@@ -195,14 +195,14 @@ static __init void early_serial_init(char *s)`
`195`	`195`	`#ifdef CONFIG_PCI`
`196`	`196`	`static void mem32_serial_out(unsigned long addr, int offset, int value)`
`197`	`197`	`{`
`198`		`- u32 vaddr = (u32 )addr;`
	`198`	`+ u32 __iomem vaddr = (u32 __iomem )addr;`
`199`	`199`	`/* shift implied by pointer type */`
`200`	`200`	`writel(value, vaddr + offset);`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`static unsigned int mem32_serial_in(unsigned long addr, int offset)`
`204`	`204`	`{`
`205`		`- u32 vaddr = (u32 )addr;`
	`205`	`+ u32 __iomem vaddr = (u32 __iomem )addr;`
`206`	`206`	`/* shift implied by pointer type */`
`207`	`207`	`return readl(vaddr + offset);`
`208`	`208`	`}`
`@@ -316,7 +316,7 @@ static struct console early_serial_console = {`
`316`	`316`	`.index = -1,`
`317`	`317`	`};`
`318`	`318`
`319`		`-static inline void early_console_register(struct console *con, int keep_early)`
	`319`	`+static void early_console_register(struct console *con, int keep_early)`
`320`	`320`	`{`
`321`	`321`	`if (con->index != -1) {`
`322`	`322`	`printk(KERN_CRIT "ERROR: earlyprintk= %s already used\n",`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ static unsigned long align_sigframe(unsigned long sp)`
`196`	`196`	`return sp;`
`197`	`197`	`}`
`198`	`198`
`199`		`-static inline void __user *`
	`199`	`+static void __user *`
`200`	`200`	`get_sigframe(struct k_sigaction ka, struct pt_regs regs, size_t frame_size,`
`201`	`201`	`void __user **fpstate)`
`202`	`202`	`{`