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

Commit 1850536b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ed8f3737 d1afa65c

Documentation/ioctl/ioctl-number.txt

+1 −0
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ Code Seq#(hex) Include File Comments 
					<mailto:buk@buks.ipn.de>

0xA0	all	linux/sdp/sdp.h		Industrial Device Project

					<mailto:kenji@bitgate.com>

0xA2	00-0F	arch/tile/include/asm/hardwall.h

0xA3	80-8F	Port ACL		in development:

					<mailto:tlewis@mindspring.com>

0xA3	90-9F	linux/dtlk.h

arch/tile/include/asm/Kbuild

+38 −0
Original line number Diff line number Diff line
@@ -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

arch/tile/include/asm/bug.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/bug.h>

arch/tile/include/asm/bugs.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/bugs.h>

arch/tile/include/asm/cputime.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/cputime.h>