Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: arch/tile/mm/init.c: trivial: use BUG_ON arch/tile: remove useless set_fixmap_nocache() macro arch/tile: add hypervisor-based character driver for SPI flash ROM ioctl-number.txt: add the tile hardwall ioctl range tile: use generic-y format for one-line asm-generic headers clocksource: tile: convert to use clocksource_register_hz
2011-08-02 21:16:11 -10:00
parent ed8f37370d d1afa65ca5
commit 1850536b93
46 changed files with 576 additions and 49 deletions
--- a/arch/tile/include/asm/Kbuild
+++ b/arch/tile/include/asm/Kbuild
@@ -2,3 +2,41 @@ include include/asm-generic/Kbuild.asm

 header-y += ucontext.h
 header-y += hardwall.h
+
+generic-y += bug.h
+generic-y += bugs.h
+generic-y += cputime.h
+generic-y += device.h
+generic-y += div64.h
+generic-y += emergency-restart.h
+generic-y += errno.h
+generic-y += fb.h
+generic-y += fcntl.h
+generic-y += ioctl.h
+generic-y += ioctls.h
+generic-y += ipc.h
+generic-y += ipcbuf.h
+generic-y += irq_regs.h
+generic-y += kdebug.h
+generic-y += local.h
+generic-y += module.h
+generic-y += msgbuf.h
+generic-y += mutex.h
+generic-y += param.h
+generic-y += parport.h
+generic-y += poll.h
+generic-y += posix_types.h
+generic-y += resource.h
+generic-y += scatterlist.h
+generic-y += sembuf.h
+generic-y += serial.h
+generic-y += shmbuf.h
+generic-y += shmparam.h
+generic-y += socket.h
+generic-y += sockios.h
+generic-y += statfs.h
+generic-y += termbits.h
+generic-y += termios.h
+generic-y += types.h
+generic-y += ucontext.h
+generic-y += xor.h
--- a/arch/tile/include/asm/bug.h
+++ b/arch/tile/include/asm/bug.h
@@ -1 +0,0 @@
-#include <asm-generic/bug.h>
--- a/arch/tile/include/asm/bugs.h
+++ b/arch/tile/include/asm/bugs.h
@@ -1 +0,0 @@
-#include <asm-generic/bugs.h>
--- a/arch/tile/include/asm/cputime.h
+++ b/arch/tile/include/asm/cputime.h
@@ -1 +0,0 @@
-#include <asm-generic/cputime.h>
--- a/arch/tile/include/asm/device.h
+++ b/arch/tile/include/asm/device.h
@@ -1 +0,0 @@
-#include <asm-generic/device.h>
--- a/arch/tile/include/asm/div64.h
+++ b/arch/tile/include/asm/div64.h
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
--- a/arch/tile/include/asm/emergency-restart.h
+++ b/arch/tile/include/asm/emergency-restart.h
@@ -1 +0,0 @@
-#include <asm-generic/emergency-restart.h>
--- a/arch/tile/include/asm/errno.h
+++ b/arch/tile/include/asm/errno.h
@@ -1 +0,0 @@
-#include <asm-generic/errno.h>
--- a/arch/tile/include/asm/fb.h
+++ b/arch/tile/include/asm/fb.h
@@ -1 +0,0 @@
-#include <asm-generic/fb.h>
--- a/arch/tile/include/asm/fcntl.h
+++ b/arch/tile/include/asm/fcntl.h
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
--- a/arch/tile/include/asm/fixmap.h
+++ b/arch/tile/include/asm/fixmap.h
@@ -75,12 +75,6 @@ extern void __set_fixmap(enum fixed_addresses idx,

 #define set_fixmap(idx, phys) \
 		__set_fixmap(idx, phys, PAGE_KERNEL)
-/*
- * Some hardware wants to get fixmapped without caching.
- */
-#define set_fixmap_nocache(idx, phys) \
-		__set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)
-
 #define clear_fixmap(idx) \
 		__set_fixmap(idx, 0, __pgprot(0))

--- a/arch/tile/include/asm/ioctl.h
+++ b/arch/tile/include/asm/ioctl.h
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
--- a/arch/tile/include/asm/ioctls.h
+++ b/arch/tile/include/asm/ioctls.h
@@ -1 +0,0 @@
-#include <asm-generic/ioctls.h>
--- a/arch/tile/include/asm/ipc.h
+++ b/arch/tile/include/asm/ipc.h
@@ -1 +0,0 @@
-#include <asm-generic/ipc.h>
--- a/arch/tile/include/asm/ipcbuf.h
+++ b/arch/tile/include/asm/ipcbuf.h
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
--- a/arch/tile/include/asm/irq_regs.h
+++ b/arch/tile/include/asm/irq_regs.h
@@ -1 +0,0 @@
-#include <asm-generic/irq_regs.h>
--- a/arch/tile/include/asm/kdebug.h
+++ b/arch/tile/include/asm/kdebug.h
@@ -1 +0,0 @@
-#include <asm-generic/kdebug.h>
--- a/arch/tile/include/asm/local.h
+++ b/arch/tile/include/asm/local.h
@@ -1 +0,0 @@
-#include <asm-generic/local.h>
--- a/arch/tile/include/asm/module.h
+++ b/arch/tile/include/asm/module.h
@@ -1 +0,0 @@
-#include <asm-generic/module.h>
--- a/arch/tile/include/asm/msgbuf.h
+++ b/arch/tile/include/asm/msgbuf.h
@@ -1 +0,0 @@
-#include <asm-generic/msgbuf.h>
--- a/arch/tile/include/asm/mutex.h
+++ b/arch/tile/include/asm/mutex.h
@@ -1 +0,0 @@
-#include <asm-generic/mutex-dec.h>
--- a/arch/tile/include/asm/param.h
+++ b/arch/tile/include/asm/param.h
@@ -1 +0,0 @@
-#include <asm-generic/param.h>
--- a/arch/tile/include/asm/parport.h
+++ b/arch/tile/include/asm/parport.h
@@ -1 +0,0 @@
-#include <asm-generic/parport.h>
--- a/arch/tile/include/asm/poll.h
+++ b/arch/tile/include/asm/poll.h
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
--- a/arch/tile/include/asm/posix_types.h
+++ b/arch/tile/include/asm/posix_types.h
@@ -1 +0,0 @@
-#include <asm-generic/posix_types.h>
--- a/arch/tile/include/asm/resource.h
+++ b/arch/tile/include/asm/resource.h
@@ -1 +0,0 @@
-#include <asm-generic/resource.h>
--- a/arch/tile/include/asm/scatterlist.h
+++ b/arch/tile/include/asm/scatterlist.h
@@ -1 +0,0 @@
-#include <asm-generic/scatterlist.h>
--- a/arch/tile/include/asm/sembuf.h
+++ b/arch/tile/include/asm/sembuf.h
@@ -1 +0,0 @@
-#include <asm-generic/sembuf.h>
--- a/arch/tile/include/asm/serial.h
+++ b/arch/tile/include/asm/serial.h
@@ -1 +0,0 @@
-#include <asm-generic/serial.h>
--- a/arch/tile/include/asm/shmbuf.h
+++ b/arch/tile/include/asm/shmbuf.h
@@ -1 +0,0 @@
-#include <asm-generic/shmbuf.h>
--- a/arch/tile/include/asm/shmparam.h
+++ b/arch/tile/include/asm/shmparam.h
@@ -1 +0,0 @@
-#include <asm-generic/shmparam.h>
--- a/arch/tile/include/asm/socket.h
+++ b/arch/tile/include/asm/socket.h
@@ -1 +0,0 @@
-#include <asm-generic/socket.h>
--- a/arch/tile/include/asm/sockios.h
+++ b/arch/tile/include/asm/sockios.h
@@ -1 +0,0 @@
-#include <asm-generic/sockios.h>
--- a/arch/tile/include/asm/statfs.h
+++ b/arch/tile/include/asm/statfs.h
@@ -1 +0,0 @@
-#include <asm-generic/statfs.h>
--- a/arch/tile/include/asm/termbits.h
+++ b/arch/tile/include/asm/termbits.h
@@ -1 +0,0 @@
-#include <asm-generic/termbits.h>
--- a/arch/tile/include/asm/termios.h
+++ b/arch/tile/include/asm/termios.h
@@ -1 +0,0 @@
-#include <asm-generic/termios.h>
--- a/arch/tile/include/asm/types.h
+++ b/arch/tile/include/asm/types.h
@@ -1 +0,0 @@
-#include <asm-generic/types.h>
--- a/arch/tile/include/asm/ucontext.h
+++ b/arch/tile/include/asm/ucontext.h
@@ -1 +0,0 @@
-#include <asm-generic/ucontext.h>
--- a/arch/tile/include/asm/xor.h
+++ b/arch/tile/include/asm/xor.h
@@ -1 +0,0 @@
-#include <asm-generic/xor.h>