Skip to contentSkip to conversation

uml problems with linux/io.h

PATCH In review Al Viro 2 participants 2 messages Dec 8, 2006

Subsystems (2)
lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 1/1 uml problems with linux/io.h

Remove useless includes of linux/io.h, don't even try to build iomap_copy on uml (it doesn't have readb() et.al., so...)

---
 crypto/blkcipher.c |    1 -
 lib/Kconfig        |    5 +++++
 lib/Makefile       |    3 ++-
 lib/ioremap.c      |    1 -
 4 files changed, 7 insertions(+), 3 deletions(-)
crypto/blkcipher.c +0 -1
index 034c939..6e93004 100644
@@ -17,7 +17,6 @@
 #include <linux/crypto.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
-#include <linux/io.h>
 #include <linux/module.h>
 #include <linux/scatterlist.h>
 #include <linux/seq_file.h>
lib/Kconfig +5 -0
index 734ce95..77eb379 100644
@@ -97,4 +97,9 @@ #
 config PLIST
 	boolean
 
+config IOMAP_COPY
+	boolean
+	depends on !UML
+	default y
+
 endmenu
lib/Makefile +2 -1
index fea8f90..92ca7fe 100644
@@ -12,13 +12,14 @@ lib-$(CONFIG_SMP) += cpumask.o
 
 lib-y	+= kobject.o kref.o kobject_uevent.o klist.o
 
-obj-y += sort.o parser.o halfmd4.o iomap_copy.o debug_locks.o random32.o
+obj-y += sort.o parser.o halfmd4.o debug_locks.o random32.o
 
 ifeq ($(CONFIG_DEBUG_KOBJECT),y)
 CFLAGS_kobject.o += -DDEBUG
 CFLAGS_kobject_uevent.o += -DDEBUG
 endif
 
+obj-$(CONFIG_IOMAP_COPY) += iomap_copy.o
 obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o
 obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
 lib-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
lib/ioremap.c +0 -1
index 99fa277..a9e4415 100644
@@ -5,7 +5,6 @@
  *
  * (C) Copyright 1995 1996 Linus Torvalds
  */
-#include <linux/io.h>
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
 
Signature · 1 line
1.4.2.GIT
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Al Viro

Remove useless includes of linux/io.h, don't even try to build iomap_copy on uml (it doesn't have readb() et.al., so...)

---
 crypto/blkcipher.c |    1 -
 lib/Kconfig        |    5 +++++
 lib/Makefile       |    3 ++-
 lib/ioremap.c      |    1 -
 4 files changed, 7 insertions(+), 3 deletions(-)
Signature · 1 line
Work email - jdike at linux dot intel dot com