From 1c7878f024705594ac455e501ad51e475a400d5d Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Fri, 20 May 2005 13:36:19 -0700
Subject: Remove some left-over empty files

Hopefully the addition of -E to my applypatch script
will mean that I won't have these kinds of leftovers
in the future.
---
 include/asm-x86_64/ioctl32.h | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 include/asm-x86_64/ioctl32.h

(limited to 'include/asm-x86_64')

diff --git a/include/asm-x86_64/ioctl32.h b/include/asm-x86_64/ioctl32.h
deleted file mode 100644
index e69de29bb2d1..000000000000
-- 
cgit 


From 4f60fdf613536402e3313c5019b3ae6060b2ae4a Mon Sep 17 00:00:00 2001
From: Alexander Nyberg <alexn@telia.com>
Date: Wed, 25 May 2005 12:31:28 -0700
Subject: [PATCH] x86_64: CONFIG_BUG=n fixes

Fixes some !CONFIG_BUG warnings:
include/asm/mmu_context.h: I funktion `switch_mm':
include/asm/mmu_context.h:57: varning: implicit declaration of function `out_of_line_bug'

Signed-off-by: Alexander Nyberg <alexn@telia.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---
 include/asm-x86_64/bug.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/asm-x86_64')

diff --git a/include/asm-x86_64/bug.h b/include/asm-x86_64/bug.h
index bdbf66eab6ee..3d2a666a5dd5 100644
--- a/include/asm-x86_64/bug.h
+++ b/include/asm-x86_64/bug.h
@@ -21,6 +21,8 @@ struct bug_frame {
 	asm volatile("ud2 ; .quad %c1 ; .short %c0" :: \
 		     "i"(__LINE__), "i" (__stringify(__FILE__)))
 void out_of_line_bug(void);
+#else
+static inline void out_of_line_bug(void) { }
 #endif
 
 #include <asm-generic/bug.h>
-- 
cgit