Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee36c2bf authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] 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...)

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 62fb2ba3

crypto/blkcipher.c

+0 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -101,4 +101,9 @@ config TEXTSEARCH_FSM 
config PLIST

	boolean



config IOMAP_COPY

	boolean

	depends on !UML

	default y



endmenu

lib/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 *

 * (C) Copyright 1995 1996 Linus Torvalds

 */

#include <linux/io.h>

#include <linux/vmalloc.h>

#include <linux/mm.h>