浏览代码

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

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
Linus Torvalds 9 年之前
父节点
当前提交
33d46f9765
共有 3 个文件被更改,包括 5 次插入5 次删除
  1. 1 1
      arch/x86/kernel/e820.c
  2. 3 3
      arch/x86/kernel/early_printk.c
  3. 1 1
      arch/x86/kernel/signal.c

+ 1 - 1
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) {
 	switch (e820_type) {
 	case E820_RESERVED_KERN:
 	case E820_RESERVED_KERN:

+ 3 - 3
arch/x86/kernel/early_printk.c

@@ -195,14 +195,14 @@ static __init void early_serial_init(char *s)
 #ifdef CONFIG_PCI
 #ifdef CONFIG_PCI
 static void mem32_serial_out(unsigned long addr, int offset, int value)
 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 */
 	/* shift implied by pointer type */
 	writel(value, vaddr + offset);
 	writel(value, vaddr + offset);
 }
 }
 
 
 static unsigned int mem32_serial_in(unsigned long addr, int 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 */
 	/* shift implied by pointer type */
 	return readl(vaddr + offset);
 	return readl(vaddr + offset);
 }
 }
@@ -316,7 +316,7 @@ static struct console early_serial_console = {
 	.index =	-1,
 	.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) {
 	if (con->index != -1) {
 		printk(KERN_CRIT "ERROR: earlyprintk= %s already used\n",
 		printk(KERN_CRIT "ERROR: earlyprintk= %s already used\n",

+ 1 - 1
arch/x86/kernel/signal.c

@@ -196,7 +196,7 @@ static unsigned long align_sigframe(unsigned long sp)
 	return sp;
 	return sp;
 }
 }
 
 
-static inline void __user *
+static void __user *
 get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
 get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
 	     void __user **fpstate)
 	     void __user **fpstate)
 {
 {