Revert "Apply various boot fixes."

This reverts commit 674d708.
lll-project · Apr 11, 2011 · df47317 · df47317
1 parent 01c9162
commit df47317
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/arch/x86/boot/tty.c b/arch/x86/boot/tty.c
@@ -27,7 +27,7 @@ int early_serial_base;
  * error during initialization.
  */
 
-static void asmregparm __attribute__((section(".inittext"))) serial_putchar(int ch)
+static void __attribute__((section(".inittext"))) serial_putchar(int ch)
 {
 	unsigned timeout = 0xffff;
 
@@ -37,7 +37,7 @@ static void asmregparm __attribute__((section(".inittext"))) serial_putchar(int
 	outb(ch, early_serial_base + TXR);
 }
 
-static void asmregparm __attribute__((section(".inittext"))) bios_putchar(int ch)
+static void __attribute__((section(".inittext"))) bios_putchar(int ch)
 {
 	struct biosregs ireg;
 

diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
@@ -176,7 +176,7 @@ struct thread_info {
 
 
 /* how to get the current stack pointer from C */
-#define current_stack_pointer ({ unsigned long esp; asm volatile("mov %%esp, %0" : "=r"(esp)); esp; })
+#define current_stack_pointer ({ unsigned long esp; asm("mov %%esp, %0" : "=r"(esp)); esp; })
 
 /* how to get the thread information struct from C */
 static inline struct thread_info *current_thread_info(void)

diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
@@ -1347,7 +1347,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
  * We must return the syscall number to actually look up in the table.
  * This can be -1L to skip running any syscall at all.
  */
-long syscall_trace_enter(struct pt_regs *regs)
+asmregparm long syscall_trace_enter(struct pt_regs *regs)
 {
 	long ret = 0;
 
@@ -1392,7 +1392,7 @@ long syscall_trace_enter(struct pt_regs *regs)
 	return ret ?: regs->orig_ax;
 }
 
-void syscall_trace_leave(struct pt_regs *regs)
+asmregparm void syscall_trace_leave(struct pt_regs *regs)
 {
 	bool step;
 

diff --git a/include/linux/init.h b/include/linux/init.h
@@ -293,13 +293,13 @@ void __init parse_early_options(char *cmdline);
 
 /* Each module must use one module_init(). */
 #define module_init(initfn)					\
-	static inline initcall_t __used __inittest(void)		\
+	static inline initcall_t __inittest(void)		\
 	{ return initfn; }					\
 	int init_module(void) __attribute__((alias(#initfn)));
 
 /* This is only required if you want to be unloadable. */
 #define module_exit(exitfn)					\
-	static inline exitcall_t __used __exittest(void)		\
+	static inline exitcall_t __exittest(void)		\
 	{ return exitfn; }					\
 	void cleanup_module(void) __attribute__((alias(#exitfn)));
 

diff --git a/include/linux/kdev_t.h b/include/linux/kdev_t.h
@@ -14,7 +14,7 @@
 #define format_dev_t(buffer, dev)					\
 	({								\
 		sprintf(buffer, "%u:%u", MAJOR(dev), MINOR(dev));	\
-		(void*)buffer;							\
+		buffer;							\
 	})
 
 /* acceptable for old filesystems */