summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-08-17 22:54:55 -0400
committerH. Peter Anvin <hpa@zytor.com>2008-10-22 22:55:20 -0700
commit1de1502c96c3c163c06419bfe838c73632fa8d9c (patch)
treec7acd47c699807af44e190b9041d2500ff2b0914 /arch/um
parentbb8985586b7a906e116db835c64773b7a7d51663 (diff)
downloadlinux-1de1502c96c3c163c06419bfe838c73632fa8d9c.tar.bz2
x86, um: now we can get rid of trivial uml headers
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/Makefile2
-rw-r--r--arch/um/include/asm/a.out.h11
-rw-r--r--arch/um/include/asm/alternative-asm.h6
-rw-r--r--arch/um/include/asm/alternative.h6
-rw-r--r--arch/um/include/asm/asm.h6
-rw-r--r--arch/um/include/asm/bitops.h10
-rw-r--r--arch/um/include/asm/boot.h6
-rw-r--r--arch/um/include/asm/bug.h6
-rw-r--r--arch/um/include/asm/byteorder.h6
-rw-r--r--arch/um/include/asm/cacheflush.h6
-rw-r--r--arch/um/include/asm/calling.h9
-rw-r--r--arch/um/include/asm/cmpxchg.h6
-rw-r--r--arch/um/include/asm/cobalt.h6
-rw-r--r--arch/um/include/asm/cpufeature.h6
-rw-r--r--arch/um/include/asm/div64.h6
-rw-r--r--arch/um/include/asm/dwarf2.h11
-rw-r--r--arch/um/include/asm/errno.h6
-rw-r--r--arch/um/include/asm/fcntl.h6
-rw-r--r--arch/um/include/asm/floppy.h6
-rw-r--r--arch/um/include/asm/frame.h6
-rw-r--r--arch/um/include/asm/ide.h6
-rw-r--r--arch/um/include/asm/ioctl.h6
-rw-r--r--arch/um/include/asm/ioctls.h6
-rw-r--r--arch/um/include/asm/ipcbuf.h6
-rw-r--r--arch/um/include/asm/linkage.h6
-rw-r--r--arch/um/include/asm/local.h6
-rw-r--r--arch/um/include/asm/locks.h6
-rw-r--r--arch/um/include/asm/mca_dma.h6
-rw-r--r--arch/um/include/asm/mman.h6
-rw-r--r--arch/um/include/asm/msgbuf.h6
-rw-r--r--arch/um/include/asm/mtrr.h6
-rw-r--r--arch/um/include/asm/nops.h6
-rw-r--r--arch/um/include/asm/paravirt.h6
-rw-r--r--arch/um/include/asm/percpu.h6
-rw-r--r--arch/um/include/asm/poll.h6
-rw-r--r--arch/um/include/asm/posix_types.h6
-rw-r--r--arch/um/include/asm/prctl.h6
-rw-r--r--arch/um/include/asm/resource.h6
-rw-r--r--arch/um/include/asm/rwlock.h6
-rw-r--r--arch/um/include/asm/rwsem.h6
-rw-r--r--arch/um/include/asm/scatterlist.h6
-rw-r--r--arch/um/include/asm/sembuf.h6
-rw-r--r--arch/um/include/asm/serial.h6
-rw-r--r--arch/um/include/asm/shmbuf.h6
-rw-r--r--arch/um/include/asm/shmparam.h6
-rw-r--r--arch/um/include/asm/siginfo.h6
-rw-r--r--arch/um/include/asm/socket.h6
-rw-r--r--arch/um/include/asm/sockios.h6
-rw-r--r--arch/um/include/asm/spinlock.h6
-rw-r--r--arch/um/include/asm/spinlock_types.h6
-rw-r--r--arch/um/include/asm/stat.h6
-rw-r--r--arch/um/include/asm/statfs.h6
-rw-r--r--arch/um/include/asm/termbits.h6
-rw-r--r--arch/um/include/asm/termios.h6
-rw-r--r--arch/um/include/asm/types.h6
-rw-r--r--arch/um/include/asm/ucontext.h6
-rw-r--r--arch/um/include/asm/unaligned.h6
-rw-r--r--arch/um/include/asm/user.h6
-rw-r--r--arch/um/include/asm/vga.h6
-rw-r--r--arch/um/include/asm/vm86.h6
60 files changed, 2 insertions, 371 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 4fc79f3030e4..3474b105ee6d 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -66,6 +66,8 @@ include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)
#This will adjust *FLAGS accordingly to the platform.
include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
+KBUILD_CPPFLAGS += -I$(srctree)/arch/$(HEADER_ARCH)/include
+
# -Derrno=kernel_errno - This turns all kernel references to errno into
# kernel_errno to separate them from the libc errno. This allows -fno-common
# in KBUILD_CFLAGS. Otherwise, it would cause ld to complain about the two different
diff --git a/arch/um/include/asm/a.out.h b/arch/um/include/asm/a.out.h
deleted file mode 100644
index 754181ee8683..000000000000
--- a/arch/um/include/asm/a.out.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (C) 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
- * Licensed under the GPL
- */
-
-#ifndef __UM_A_OUT_H
-#define __UM_A_OUT_H
-
-#include "asm/arch/a.out.h"
-
-#endif
diff --git a/arch/um/include/asm/alternative-asm.h b/arch/um/include/asm/alternative-asm.h
deleted file mode 100644
index 9aa9fa2402a4..000000000000
--- a/arch/um/include/asm/alternative-asm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_ALTERNATIVE_ASM_I
-#define __UM_ALTERNATIVE_ASM_I
-
-#include "asm/arch/alternative-asm.h"
-
-#endif
diff --git a/arch/um/include/asm/alternative.h b/arch/um/include/asm/alternative.h
deleted file mode 100644
index b6434396bd42..000000000000
--- a/arch/um/include/asm/alternative.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_ALTERNATIVE_H
-#define __UM_ALTERNATIVE_H
-
-#include "asm/arch/alternative.h"
-
-#endif
diff --git a/arch/um/include/asm/asm.h b/arch/um/include/asm/asm.h
deleted file mode 100644
index af1269a1e9eb..000000000000
--- a/arch/um/include/asm/asm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_ASM_H
-#define __UM_ASM_H
-
-#include "asm/arch/asm.h"
-
-#endif
diff --git a/arch/um/include/asm/bitops.h b/arch/um/include/asm/bitops.h
deleted file mode 100644
index e4d38d437b97..000000000000
--- a/arch/um/include/asm/bitops.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __UM_BITOPS_H
-#define __UM_BITOPS_H
-
-#ifndef _LINUX_BITOPS_H
-#error only <linux/bitops.h> can be included directly
-#endif
-
-#include "asm/arch/bitops.h"
-
-#endif
diff --git a/arch/um/include/asm/boot.h b/arch/um/include/asm/boot.h
deleted file mode 100644
index 09548c3e784e..000000000000
--- a/arch/um/include/asm/boot.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_BOOT_H
-#define __UM_BOOT_H
-
-#include "asm/arch/boot.h"
-
-#endif
diff --git a/arch/um/include/asm/bug.h b/arch/um/include/asm/bug.h
deleted file mode 100644
index 9e33b864c359..000000000000
--- a/arch/um/include/asm/bug.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_BUG_H
-#define __UM_BUG_H
-
-#include <asm-generic/bug.h>
-
-#endif
diff --git a/arch/um/include/asm/byteorder.h b/arch/um/include/asm/byteorder.h
deleted file mode 100644
index eee0a834f447..000000000000
--- a/arch/um/include/asm/byteorder.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_BYTEORDER_H
-#define __UM_BYTEORDER_H
-
-#include "asm/arch/byteorder.h"
-
-#endif
diff --git a/arch/um/include/asm/cacheflush.h b/arch/um/include/asm/cacheflush.h
deleted file mode 100644
index 12e9d4b74c8f..000000000000
--- a/arch/um/include/asm/cacheflush.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_CACHEFLUSH_H
-#define __UM_CACHEFLUSH_H
-
-#include "asm/arch/cacheflush.h"
-
-#endif
diff --git a/arch/um/include/asm/calling.h b/arch/um/include/asm/calling.h
deleted file mode 100644
index 0b2384cc99fd..000000000000
--- a/arch/um/include/asm/calling.h
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2003 - 2004 Pathscale, Inc
-# Released under the GPL
-
-#ifndef __UM_CALLING_H /* XXX x86_64 */
-#define __UM_CALLING_H
-
-#include "asm/arch/calling.h"
-
-#endif
diff --git a/arch/um/include/asm/cmpxchg.h b/arch/um/include/asm/cmpxchg.h
deleted file mode 100644
index 529376a99885..000000000000
--- a/arch/um/include/asm/cmpxchg.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_CMPXCHG_H
-#define __UM_CMPXCHG_H
-
-#include "asm/arch/cmpxchg.h"
-
-#endif
diff --git a/arch/um/include/asm/cobalt.h b/arch/um/include/asm/cobalt.h
deleted file mode 100644
index f813a684be98..000000000000
--- a/arch/um/include/asm/cobalt.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_COBALT_H
-#define __UM_COBALT_H
-
-#include "asm/arch/cobalt.h"
-
-#endif
diff --git a/arch/um/include/asm/cpufeature.h b/arch/um/include/asm/cpufeature.h
deleted file mode 100644
index fb7bd42a4d96..000000000000
--- a/arch/um/include/asm/cpufeature.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_CPUFEATURE_H
-#define __UM_CPUFEATURE_H
-
-#include "asm/arch/cpufeature.h"
-
-#endif
diff --git a/arch/um/include/asm/div64.h b/arch/um/include/asm/div64.h
deleted file mode 100644
index 1e17f7409cab..000000000000
--- a/arch/um/include/asm/div64.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _UM_DIV64_H
-#define _UM_DIV64_H
-
-#include "asm/arch/div64.h"
-
-#endif
diff --git a/arch/um/include/asm/dwarf2.h b/arch/um/include/asm/dwarf2.h
deleted file mode 100644
index d1a02e762931..000000000000
--- a/arch/um/include/asm/dwarf2.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Copyright 2003 - 2004 Pathscale, Inc
- * Released under the GPL
- */
-
-/* Needed on x86_64 by thunk.S */
-#ifndef __UM_DWARF2_H
-#define __UM_DWARF2_H
-
-#include "asm/arch/dwarf2.h"
-
-#endif
diff --git a/arch/um/include/asm/errno.h b/arch/um/include/asm/errno.h
deleted file mode 100644
index b7a9e37fd8d8..000000000000
--- a/arch/um/include/asm/errno.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_ERRNO_H
-#define __UM_ERRNO_H
-
-#include "asm/arch/errno.h"
-
-#endif
diff --git a/arch/um/include/asm/fcntl.h b/arch/um/include/asm/fcntl.h
deleted file mode 100644
index 812a65446d92..000000000000
--- a/arch/um/include/asm/fcntl.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_FCNTL_H
-#define __UM_FCNTL_H
-
-#include "asm/arch/fcntl.h"
-
-#endif
diff --git a/arch/um/include/asm/floppy.h b/arch/um/include/asm/floppy.h
deleted file mode 100644
index 453e7415fb6f..000000000000
--- a/arch/um/include/asm/floppy.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_FLOPPY_H
-#define __UM_FLOPPY_H
-
-#include "asm/arch/floppy.h"
-
-#endif
diff --git a/arch/um/include/asm/frame.h b/arch/um/include/asm/frame.h
deleted file mode 100644
index 8a8c1cb415b4..000000000000
--- a/arch/um/include/asm/frame.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_FRAME_I
-#define __UM_FRAME_I
-
-#include "asm/arch/frame.h"
-
-#endif
diff --git a/arch/um/include/asm/ide.h b/arch/um/include/asm/ide.h
deleted file mode 100644
index 3d1ccebcfbaf..000000000000
--- a/arch/um/include/asm/ide.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_IDE_H
-#define __UM_IDE_H
-
-#include "asm/arch/ide.h"
-
-#endif
diff --git a/arch/um/include/asm/ioctl.h b/arch/um/include/asm/ioctl.h
deleted file mode 100644
index cc22157346db..000000000000
--- a/arch/um/include/asm/ioctl.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_IOCTL_H
-#define __UM_IOCTL_H
-
-#include "asm/arch/ioctl.h"
-
-#endif
diff --git a/arch/um/include/asm/ioctls.h b/arch/um/include/asm/ioctls.h
deleted file mode 100644
index 9a1a017de6a7..000000000000
--- a/arch/um/include/asm/ioctls.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_IOCTLS_H
-#define __UM_IOCTLS_H
-
-#include "asm/arch/ioctls.h"
-
-#endif
diff --git a/arch/um/include/asm/ipcbuf.h b/arch/um/include/asm/ipcbuf.h
deleted file mode 100644
index bb2ad31dc434..000000000000
--- a/arch/um/include/asm/ipcbuf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_IPCBUF_H
-#define __UM_IPCBUF_H
-
-#include "asm/arch/ipcbuf.h"
-
-#endif
diff --git a/arch/um/include/asm/linkage.h b/arch/um/include/asm/linkage.h
deleted file mode 100644
index 7dfce37adc8b..000000000000
--- a/arch/um/include/asm/linkage.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_UM_LINKAGE_H
-#define __ASM_UM_LINKAGE_H
-
-#include "asm/arch/linkage.h"
-
-#endif
diff --git a/arch/um/include/asm/local.h b/arch/um/include/asm/local.h
deleted file mode 100644
index 9a280c5bb609..000000000000
--- a/arch/um/include/asm/local.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_LOCAL_H
-#define __UM_LOCAL_H
-
-#include "asm/arch/local.h"
-
-#endif
diff --git a/arch/um/include/asm/locks.h b/arch/um/include/asm/locks.h
deleted file mode 100644
index f80030a3ef5a..000000000000
--- a/arch/um/include/asm/locks.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_LOCKS_H
-#define __UM_LOCKS_H
-
-#include "asm/arch/locks.h"
-
-#endif
diff --git a/arch/um/include/asm/mca_dma.h b/arch/um/include/asm/mca_dma.h
deleted file mode 100644
index e492e4ec1392..000000000000
--- a/arch/um/include/asm/mca_dma.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef mca___UM_DMA_H
-#define mca___UM_DMA_H
-
-#include "asm/arch/mca_dma.h"
-
-#endif
diff --git a/arch/um/include/asm/mman.h b/arch/um/include/asm/mman.h
deleted file mode 100644
index b09ed523019b..000000000000
--- a/arch/um/include/asm/mman.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_MMAN_H
-#define __UM_MMAN_H
-
-#include "asm/arch/mman.h"
-
-#endif
diff --git a/arch/um/include/asm/msgbuf.h b/arch/um/include/asm/msgbuf.h
deleted file mode 100644
index 8ce8c30d5377..000000000000
--- a/arch/um/include/asm/msgbuf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_MSGBUF_H
-#define __UM_MSGBUF_H
-
-#include "asm/arch/msgbuf.h"
-
-#endif
diff --git a/arch/um/include/asm/mtrr.h b/arch/um/include/asm/mtrr.h
deleted file mode 100644
index 5e9cd12c578d..000000000000
--- a/arch/um/include/asm/mtrr.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_MTRR_H
-#define __UM_MTRR_H
-
-#include "asm/arch/mtrr.h"
-
-#endif
diff --git a/arch/um/include/asm/nops.h b/arch/um/include/asm/nops.h
deleted file mode 100644
index 814e9bf5dea6..000000000000
--- a/arch/um/include/asm/nops.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_NOPS_H
-#define __UM_NOPS_H
-
-#include "asm/arch/nops.h"
-
-#endif
diff --git a/arch/um/include/asm/paravirt.h b/arch/um/include/asm/paravirt.h
deleted file mode 100644
index 9d6aaad80b5f..000000000000
--- a/arch/um/include/asm/paravirt.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_PARAVIRT_H
-#define __UM_PARAVIRT_H
-
-#include "asm/arch/paravirt.h"
-
-#endif
diff --git a/arch/um/include/asm/percpu.h b/arch/um/include/asm/percpu.h
deleted file mode 100644
index 5723e2aab8e7..000000000000
--- a/arch/um/include/asm/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_PERCPU_H
-#define __UM_PERCPU_H
-
-#include "asm/arch/percpu.h"
-
-#endif
diff --git a/arch/um/include/asm/poll.h b/arch/um/include/asm/poll.h
deleted file mode 100644
index 1eb4e1bc6383..000000000000
--- a/arch/um/include/asm/poll.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_POLL_H
-#define __UM_POLL_H
-
-#include "asm/arch/poll.h"
-
-#endif
diff --git a/arch/um/include/asm/posix_types.h b/arch/um/include/asm/posix_types.h
deleted file mode 100644
index 32fb4198f644..000000000000
--- a/arch/um/include/asm/posix_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_POSIX_TYPES_H
-#define __UM_POSIX_TYPES_H
-
-#include "asm/arch/posix_types.h"
-
-#endif
diff --git a/arch/um/include/asm/prctl.h b/arch/um/include/asm/prctl.h
deleted file mode 100644
index 64b6d099bdd5..000000000000
--- a/arch/um/include/asm/prctl.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_PRCTL_H
-#define __UM_PRCTL_H
-
-#include "asm/arch/prctl.h"
-
-#endif
diff --git a/arch/um/include/asm/resource.h b/arch/um/include/asm/resource.h
deleted file mode 100644
index c9b074001252..000000000000
--- a/arch/um/include/asm/resource.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_RESOURCE_H
-#define __UM_RESOURCE_H
-
-#include "asm/arch/resource.h"
-
-#endif
diff --git a/arch/um/include/asm/rwlock.h b/arch/um/include/asm/rwlock.h
deleted file mode 100644
index ff383aafc9fe..000000000000
--- a/arch/um/include/asm/rwlock.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_RWLOCK_H
-#define __UM_RWLOCK_H
-
-#include "asm/arch/rwlock.h"
-
-#endif
diff --git a/arch/um/include/asm/rwsem.h b/arch/um/include/asm/rwsem.h
deleted file mode 100644
index b5fc449dc86b..000000000000
--- a/arch/um/include/asm/rwsem.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_RWSEM_H__
-#define __UM_RWSEM_H__
-
-#include "asm/arch/rwsem.h"
-
-#endif
diff --git a/arch/um/include/asm/scatterlist.h b/arch/um/include/asm/scatterlist.h
deleted file mode 100644
index e92016aa2079..000000000000
--- a/arch/um/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_SCATTERLIST_H
-#define __UM_SCATTERLIST_H
-
-#include "asm/arch/scatterlist.h"
-
-#endif
diff --git a/arch/um/include/asm/sembuf.h b/arch/um/include/asm/sembuf.h
deleted file mode 100644
index 1ae82c14ff86..000000000000
--- a/arch/um/include/asm/sembuf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_SEMBUF_H
-#define __UM_SEMBUF_H
-
-#include "asm/arch/sembuf.h"
-
-#endif
diff --git a/arch/um/include/asm/serial.h b/arch/um/include/asm/serial.h
deleted file mode 100644
index 61ad07cfd2d5..000000000000
--- a/arch/um/include/asm/serial.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_SERIAL_H
-#define __UM_SERIAL_H
-
-#include "asm/arch/serial.h"
-
-#endif
diff --git a/arch/um/include/asm/shmbuf.h b/arch/um/include/asm/shmbuf.h
deleted file mode 100644
index 9684d4a284a6..000000000000
--- a/arch/um/include/asm/shmbuf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_SHMBUF_H
-#define __UM_SHMBUF_H
-
-#include "asm/arch/shmbuf.h"
-
-#endif
diff --git a/arch/um/include/asm/shmparam.h b/arch/um/include/asm/shmparam.h
deleted file mode 100644
index 124c00174f6a..000000000000
--- a/arch/um/include/asm/shmparam.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_SHMPARAM_H
-#define __UM_SHMPARAM_H
-
-#include "asm/arch/shmparam.h"
-
-#endif
diff --git a/arch/um/include/asm/siginfo.h b/arch/um/include/asm/siginfo.h
deleted file mode 100644
index bec6124c36d0..000000000000
--- a/arch/um/include/asm/siginfo.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_SIGINFO_H
-#define __UM_SIGINFO_H
-
-#include "asm/arch/siginfo.h"
-
-#endif
diff --git a/arch/um/include/asm/socket.h b/arch/um/include/asm/socket.h
deleted file mode 100644
index 67886e42ef04..000000000000
--- a/arch/um/include/asm/socket.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_SOCKET_H
-#define __UM_SOCKET_H
-
-#include "asm/arch/socket.h"
-
-#endif
diff --git a/arch/um/include/asm/sockios.h b/arch/um/include/asm/sockios.h
deleted file mode 100644
index 93ee1c55c4d6..000000000000
--- a/arch/um/include/asm/sockios.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_SOCKIOS_H
-#define __UM_SOCKIOS_H
-
-#include "asm/arch/sockios.h"
-
-#endif
diff --git a/arch/um/include/asm/spinlock.h b/arch/um/include/asm/spinlock.h
deleted file mode 100644
index f18c82886992..000000000000
--- a/arch/um/include/asm/spinlock.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_SPINLOCK_H
-#define __UM_SPINLOCK_H
-
-#include "asm/arch/spinlock.h"
-
-#endif
diff --git a/arch/um/include/asm/spinlock_types.h b/arch/um/include/asm/spinlock_types.h
deleted file mode 100644
index e5a94294bf82..000000000000
--- a/arch/um/include/asm/spinlock_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_SPINLOCK_TYPES_H
-#define __UM_SPINLOCK_TYPES_H
-
-#include "asm/arch/spinlock_types.h"
-
-#endif
diff --git a/arch/um/include/asm/stat.h b/arch/um/include/asm/stat.h
deleted file mode 100644
index 83ed85ad2539..000000000000
--- a/arch/um/include/asm/stat.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_STAT_H
-#define __UM_STAT_H
-
-#include "asm/arch/stat.h"
-
-#endif
diff --git a/arch/um/include/asm/statfs.h b/arch/um/include/asm/statfs.h
deleted file mode 100644
index ba6fb53e7f87..000000000000
--- a/arch/um/include/asm/statfs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _UM_STATFS_H
-#define _UM_STATFS_H
-
-#include "asm/arch/statfs.h"
-
-#endif
diff --git a/arch/um/include/asm/termbits.h b/arch/um/include/asm/termbits.h
deleted file mode 100644
index 5739c608a2cb..000000000000
--- a/arch/um/include/asm/termbits.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_TERMBITS_H
-#define __UM_TERMBITS_H
-
-#include "asm/arch/termbits.h"
-
-#endif
diff --git a/arch/um/include/asm/termios.h b/arch/um/include/asm/termios.h
deleted file mode 100644
index d9f97b303311..000000000000
--- a/arch/um/include/asm/termios.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_TERMIOS_H
-#define __UM_TERMIOS_H
-
-#include "asm/arch/termios.h"
-
-#endif
diff --git a/arch/um/include/asm/types.h b/arch/um/include/asm/types.h
deleted file mode 100644
index 816e9590fc73..000000000000
--- a/arch/um/include/asm/types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_TYPES_H
-#define __UM_TYPES_H
-
-#include "asm/arch/types.h"
-
-#endif
diff --git a/arch/um/include/asm/ucontext.h b/arch/um/include/asm/ucontext.h
deleted file mode 100644
index 5c96c0e607f0..000000000000
--- a/arch/um/include/asm/ucontext.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_UM_UCONTEXT_H
-#define _ASM_UM_UCONTEXT_H
-
-#include "asm/arch/ucontext.h"
-
-#endif
diff --git a/arch/um/include/asm/unaligned.h b/arch/um/include/asm/unaligned.h
deleted file mode 100644
index a47196974e39..000000000000
--- a/arch/um/include/asm/unaligned.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_UM_UNALIGNED_H
-#define _ASM_UM_UNALIGNED_H
-
-#include "asm/arch/unaligned.h"
-
-#endif /* _ASM_UM_UNALIGNED_H */
diff --git a/arch/um/include/asm/user.h b/arch/um/include/asm/user.h
deleted file mode 100644
index aae414ee1f5e..000000000000
--- a/arch/um/include/asm/user.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_USER_H
-#define __UM_USER_H
-
-#include "asm/arch/user.h"
-
-#endif
diff --git a/arch/um/include/asm/vga.h b/arch/um/include/asm/vga.h
deleted file mode 100644
index 903a592b00d0..000000000000
--- a/arch/um/include/asm/vga.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_VGA_H
-#define __UM_VGA_H
-
-#include "asm/arch/vga.h"
-
-#endif
diff --git a/arch/um/include/asm/vm86.h b/arch/um/include/asm/vm86.h
deleted file mode 100644
index 7801f82de1f4..000000000000
--- a/arch/um/include/asm/vm86.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __UM_VM86_H
-#define __UM_VM86_H
-
-#include "asm/arch/vm86.h"
-
-#endif