Hmm.. It was never correct to directly include <asm/smplock.h>,

but some files still did (and got the wrong results on UP).

Since they didn't actually _use_ the BKL anyway, remove the
include.

diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c
index 34734659967190c43f3853dc1cf476925d086153..febc92067e942c2a55b1b5807a6b53cf1346a6f7 100644 (file)
--- a/drivers/ieee1394/ieee1394_core.c
+++ b/drivers/ieee1394/ieee1394_core.c
@@ -22,7 +22,6 @@
 #include <asm/bitops.h>
 #include <asm/byteorder.h>
 #include <asm/semaphore.h>
-#include <asm/smplock.h>
 
 #include "ieee1394_types.h"
 #include "ieee1394.h"

diff --git a/mm/rmap.c b/mm/rmap.c
index 714395e1287892c6f3b3009732de8edcdae593ff..c39ca44257199bf4249425d97c7728ffbfbf9701 100644 (file)
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -28,7 +28,6 @@
 
 #include <asm/pgalloc.h>
 #include <asm/rmap.h>
-#include <asm/smplock.h>
 #include <asm/tlb.h>
 #include <asm/tlbflush.h>