Revert "More boot fixes, warning supressions."

This reverts commit b9e0729.

Makefile

@@ -401,7 +401,6 @@ KBUILD_CFLAGS   := -Wall -W -Wundef -Wstrict-prototypes -Wno-trigraphs \
 		   -Wno-unknown-warning-option -Wno-missing-field-initializers \
 		   -fno-strict-aliasing -fno-common \
 		   -Werror-implicit-function-declaration \
-       -Wno-shift-overflow \
 		   -Wno-format-security
 KBUILD_AFLAGS_KERNEL :=
 KBUILD_CFLAGS_KERNEL :=

arch/x86/boot/boot.h

@@ -30,8 +30,6 @@
 #include <asm/processor-flags.h>
 #include "ctype.h"
 
-#define asmregparm __attribute__((regparm(3)))
-
 #ifdef CONFIG_X86_32
 #define asmlinkage __attribute__((regparm(0)))
 #else
@@ -233,12 +231,12 @@ static inline bool heap_free(size_t n)
 
 /* copy.S */
 
-void asmregparm copy_to_fs(addr_t dst, void *src, size_t len);
-void * asmregparm copy_from_fs(void *dst, addr_t src, size_t len);
-void asmregparm copy_to_gs(addr_t dst, void *src, size_t len);
-void * asmregparm copy_from_gs(void *dst, addr_t src, size_t len);
+void copy_to_fs(addr_t dst, void *src, size_t len);
+void *copy_from_fs(void *dst, addr_t src, size_t len);
+void copy_to_gs(addr_t dst, void *src, size_t len);
+void *copy_from_gs(void *dst, addr_t src, size_t len);
 
-static inline void * asmregparm memcpy(void *d, const void *s, size_t l)
+static inline void *memcpy(void *d, const void *s, size_t l)
 {
 	int d0, d1, d2;
 	asm volatile("rep ; addr32 movsb\n\t"
@@ -248,7 +246,7 @@ static inline void * asmregparm memcpy(void *d, const void *s, size_t l)
 	return d;
 }
 
-static inline void * asmregparm memset(void *d, char c, size_t l)
+static inline void *memset(void *d, char c, size_t l)
 {
 	int d0, d1;
 	asm volatile("rep ; addr32 stosb\n\t"
@@ -305,7 +303,7 @@ struct biosregs {
 		};
 	};
 };
-void asmregparm intcall(u8 int_no, const struct biosregs *ireg, struct biosregs *oreg);
+void intcall(u8 int_no, const struct biosregs *ireg, struct biosregs *oreg);
 
 /* cmdline.c */
 int __cmdline_find_option(u32 cmdline_ptr, const char *option, char *buffer, int bufsize);
@@ -351,7 +349,7 @@ int detect_memory(void);
 void __attribute__((noreturn)) go_to_protected_mode(void);
 
 /* pmjump.S */
-void asmregparm __attribute__((noreturn))
+void __attribute__((noreturn))
 	protected_mode_jump(u32 entrypoint, u32 bootparams);
 
 /* printf.c */
@@ -370,8 +368,8 @@ unsigned int atou(const char *s);
 unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base);
 
 /* tty.c */
-void asmregparm puts(const char *);
-void asmregparm putchar(int);
+void puts(const char *);
+void putchar(int);
 int getchar(void);
 void kbd_flush(void);
 int getchar_timeout(void);

arch/x86/lib/delay.c

@@ -115,7 +115,7 @@ EXPORT_SYMBOL(__delay);
 
 inline void __const_udelay(unsigned long xloops)
 {
-	unsigned long d0;
+	int d0;
 
 	xloops *= 4;
 	asm("mull %%edx"

arch/x86/pci/pcbios.c

@@ -88,22 +88,20 @@ static struct {
 static unsigned long bios32_service(unsigned long service)
 {
 	unsigned char return_code;	/* %al */
-	unsigned long return_code_compat;	/* %eax */
 	unsigned long address;		/* %ebx */
 	unsigned long length;		/* %ecx */
 	unsigned long entry;		/* %edx */
 	unsigned long flags;
 
 	local_irq_save(flags);
 	__asm__("lcall *(%%edi); cld"
-		: "=a" (return_code_compat),
+		: "=a" (return_code),
 		  "=b" (address),
 		  "=c" (length),
 		  "=d" (entry)
 		: "0" (service),
 		  "1" (0),
 		  "D" (&bios32_indirect));
-  return_code = return_code_compt
 	local_irq_restore(flags);
 
 	switch (return_code) {

arch/x86/vdso/Makefile

@@ -37,14 +37,8 @@ $(obj)/%.so: OBJCOPYFLAGS := -S
 $(obj)/%.so: $(obj)/%.so.dbg FORCE
 	$(call if_changed,objcopy)
 
-CFL := -fPIC -m64 $(call cc-option, -fno-stack-protector)
-
-# TODO: fix on the clang side
-ifeq ($(call cc-option, -Xclang),)
-  CFL += -Xclang -mcode-model -Xclang small $(filter -g%,$(KBUILD_CFLAGS))
-else
-  CFL += -mcmodel=small -fasynchronous-unwind-tables
-endif
+CFL := $(PROFILING) -Xclang -mcode-model -Xclang small -fPIC -m64 \
+       $(filter -g%,$(KBUILD_CFLAGS)) $(call cc-option, -fno-stack-protector)
 
 $(vobjs): KBUILD_CFLAGS += $(CFL)
 

arch/x86/vdso/vextern.h

@@ -1,7 +1,7 @@
 #ifndef VEXTERN
 #include <asm/vsyscall.h>
 #define VEXTERN(x) \
-	typeof(x) *vdso_ ## x __attribute__((weak, visibility("hidden")));
+	extern typeof(x) *vdso_ ## x __attribute__((visibility("hidden")));
 #endif
 
 #define VMAGIC 0xfeedbabeabcdefabUL

arch/x86/vdso/vvar.c

@@ -8,5 +8,5 @@
 #include <asm/timex.h>
 #include <asm/vgtod.h>
 
-#define VEXTERN(x) typeof (__ ## x) *vdso_ ## x = (void *)VMAGIC;
+#define VEXTERN(x) typeof (__ ## x) *const vdso_ ## x = (void *)VMAGIC;
 #include "vextern.h"

include/linux/perf_event.h

@@ -1044,24 +1044,15 @@ extern atomic_t perf_task_events;
 
 static inline void perf_event_task_sched_in(struct task_struct *task)
 {
-  JUMP_LABEL(&perf_task_events, have_events);
-  return;
-
- have_events:
-  __perf_event_task_sched_in(task);
+	COND_STMT(&perf_task_events, __perf_event_task_sched_in(task));
 }
 
 static inline
 void perf_event_task_sched_out(struct task_struct *task, struct task_struct *next)
 {
 	perf_sw_event(PERF_COUNT_SW_CONTEXT_SWITCHES, 1, 1, NULL, 0);
 
-  JUMP_LABEL(&perf_task_events, have_events);
-  return;
-
- have_events:
-  __perf_event_task_sched_out(task, next);
-
+	COND_STMT(&perf_task_events, __perf_event_task_sched_out(task, next));
 }
 
 extern void perf_event_mmap(struct vm_area_struct *vma);