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

Commit 2e1e9212 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (29 commits)
  sh: enable maple_keyb in dreamcast_defconfig.
  SH2(A) cache update
  nommu: Provide vmalloc_exec().
  add addrespace definition for sh2a.
  sh: Kill off ARCH_SUPPORTS_AOUT and remnants of a.out support.
  sh: define GENERIC_HARDIRQS_NO__DO_IRQ.
  sh: define GENERIC_LOCKBREAK.
  sh: Save NUMA node data in vmcore for crash dumps.
  sh: module_alloc() should be using vmalloc_exec().
  sh: Fix up __bug_table handling in module loader.
  sh: Add documentation and integrate into docbook build.
  sh: Fix up broken kerneldoc comments.
  maple: Kill useless private_data pointer.
  maple: Clean up maple_driver_register/unregister routines.
  input: Clean up maple keyboard driver
  maple: allow removal and reinsertion of keyboard driver module
  sh: /proc/asids depends on MMU.
  arch/sh/boards/mach-se/7343/irq.c: removed duplicated #include
  arch/sh/boards/board-ap325rxa.c: removed duplicated #include
  sh/boards/Makefile typo fix
  ...
parents 2acb802b f5663f5b

Documentation/DocBook/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \ 
	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \

	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    mac80211.xml debugobjects.xml

	    mac80211.xml debugobjects.xml sh.xml





###

###

# The build process is as follows (targets):

# The build process is as follows (targets):

Documentation/DocBook/sh.tmpl

0 → 100644
+105 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>



<book id="sh-drivers">

 <bookinfo>

  <title>SuperH Interfaces Guide</title>

  

  <authorgroup>

   <author>

    <firstname>Paul</firstname>

    <surname>Mundt</surname>

    <affiliation>

     <address>

      <email>lethal@linux-sh.org</email>

     </address>

    </affiliation>

   </author>

  </authorgroup>



  <copyright>

   <year>2008</year>

   <holder>Paul Mundt</holder>

  </copyright>

  <copyright>

   <year>2008</year>

   <holder>Renesas Technology Corp.</holder>

  </copyright>



  <legalnotice>

   <para>

     This documentation is free software; you can redistribute

     it and/or modify it under the terms of the GNU General Public

     License version 2 as published by the Free Software Foundation.

   </para>

      

   <para>

     This program is distributed in the hope that it will be

     useful, but WITHOUT ANY WARRANTY; without even the implied

     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

     See the GNU General Public License for more details.

   </para>

      

   <para>

     You should have received a copy of the GNU General Public

     License along with this program; if not, write to the Free

     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,

     MA 02111-1307 USA

   </para>

      

   <para>

     For more details see the file COPYING in the source

     distribution of Linux.

   </para>

  </legalnotice>

 </bookinfo>



<toc></toc>



  <chapter id="mm">

    <title>Memory Management</title>

    <sect1 id="sh4">

    <title>SH-4</title>

      <sect2 id="sq">

        <title>Store Queue API</title>

!Earch/sh/kernel/cpu/sh4/sq.c

      </sect2>

    </sect1>

    <sect1 id="sh5">

      <title>SH-5</title>

      <sect2 id="tlb">

	<title>TLB Interfaces</title>

!Iarch/sh/mm/tlb-sh5.c

!Iarch/sh/include/asm/tlb_64.h

      </sect2>

    </sect1>

  </chapter>

  <chapter id="clk">

    <title>Clock Framework Extensions</title>

!Iarch/sh/include/asm/clock.h

  </chapter>

  <chapter id="mach">

    <title>Machine Specific Interfaces</title>

    <sect1 id="dreamcast">

      <title>mach-dreamcast</title>

!Iarch/sh/boards/mach-dreamcast/rtc.c

    </sect1>

    <sect1 id="x3proto">

      <title>mach-x3proto</title>

!Earch/sh/boards/mach-x3proto/ilsel.c

    </sect1>

  </chapter>

  <chapter id="busses">

    <title>Busses</title>

    <sect1 id="superhyway">

      <title>SuperHyway</title>

!Edrivers/sh/superhyway/superhyway.c

    </sect1>



    <sect1 id="maple">

      <title>Maple</title>

!Edrivers/sh/maple/maple.c

    </sect1>

  </chapter>

</book>

arch/sh/Kconfig

+24 −3
Original line number Original line Diff line number Diff line
@@ -48,6 +48,9 @@ config GENERIC_HWEIGHT 
config GENERIC_HARDIRQS

config GENERIC_HARDIRQS

	def_bool y

	def_bool y





config GENERIC_HARDIRQS_NO__DO_IRQ

	def_bool y



config GENERIC_IRQ_PROBE

config GENERIC_IRQ_PROBE

	def_bool y

	def_bool y
@@ -63,6 +66,10 @@ config GENERIC_TIME 
config GENERIC_CLOCKEVENTS

config GENERIC_CLOCKEVENTS

	def_bool n

	def_bool n





config GENERIC_LOCKBREAK

	def_bool y

	depends on SMP && PREEMPT



config SYS_SUPPORTS_PM

config SYS_SUPPORTS_PM

	bool

	bool
@@ -94,9 +101,6 @@ config ARCH_HAS_ILOG2_U64 
config ARCH_NO_VIRT_TO_BUS

config ARCH_NO_VIRT_TO_BUS

	def_bool y

	def_bool y





config ARCH_SUPPORTS_AOUT

	def_bool y



config IO_TRAPPED

config IO_TRAPPED

	bool

	bool
@@ -483,6 +487,23 @@ config CRASH_DUMP 




	  For more details see Documentation/kdump/kdump.txt

	  For more details see Documentation/kdump/kdump.txt





config SECCOMP

	bool "Enable seccomp to safely compute untrusted bytecode"

	depends on PROC_FS

	default y

	help

	  This kernel feature is useful for number crunching applications

	  that may need to compute untrusted bytecode during their

	  execution. By using pipes or other transports made available to

	  the process as file descriptors supporting the read/write

	  syscalls, it's possible to isolate those applications in

	  their own address space using seccomp. Once seccomp is

	  enabled via prctl, it cannot be disabled and the task is only

	  allowed to execute a few safe syscalls defined by each seccomp

	  mode.



	  If unsure, say N.



config SMP

config SMP

	bool "Symmetric multi-processing support"

	bool "Symmetric multi-processing support"

	depends on SYS_SUPPORTS_SMP

	depends on SYS_SUPPORTS_SMP

arch/sh/Kconfig.debug

+1 −1
Original line number Original line Diff line number Diff line
@@ -182,7 +182,7 @@ if SUPERH64 




config SH64_PROC_ASIDS

config SH64_PROC_ASIDS

	bool "Debug: report ASIDs through /proc/asids"

	bool "Debug: report ASIDs through /proc/asids"

	depends on PROC_FS

	depends on PROC_FS && MMU





config SH64_SR_WATCH

config SH64_SR_WATCH

	bool "Debug: set SR.WATCH to enable hardware watchpoints and trace"

	bool "Debug: set SR.WATCH to enable hardware watchpoints and trace"

arch/sh/Makefile

+8 −8
Original line number Original line Diff line number Diff line
@@ -95,8 +95,6 @@ head-y := arch/sh/kernel/init_task.o 
head-$(CONFIG_SUPERH32)	+= arch/sh/kernel/head_32.o

head-$(CONFIG_SUPERH32)	+= arch/sh/kernel/head_32.o

head-$(CONFIG_SUPERH64)	+= arch/sh/kernel/head_64.o

head-$(CONFIG_SUPERH64)	+= arch/sh/kernel/head_64.o





LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)



core-y				+= arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/

core-y				+= arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/

core-$(CONFIG_SH_FPU_EMU)	+= arch/sh/math-emu/

core-$(CONFIG_SH_FPU_EMU)	+= arch/sh/math-emu/
@@ -145,10 +143,6 @@ cpuincdir-$(CONFIG_CPU_SH4) += cpu-sh4 
cpuincdir-$(CONFIG_CPU_SH5)	+= cpu-sh5

cpuincdir-$(CONFIG_CPU_SH5)	+= cpu-sh5

cpuincdir-y			+= cpu-common	# Must be last

cpuincdir-y			+= cpu-common	# Must be last





libs-$(CONFIG_SUPERH32)		:= arch/sh/lib/	$(libs-y)

libs-$(CONFIG_SUPERH64)		:= arch/sh/lib64/ $(libs-y)

libs-y				+= $(LIBGCC)



drivers-y			+= arch/sh/drivers/

drivers-y			+= arch/sh/drivers/

drivers-$(CONFIG_OPROFILE)	+= arch/sh/oprofile/

drivers-$(CONFIG_OPROFILE)	+= arch/sh/oprofile/
@@ -161,10 +155,16 @@ KBUILD_CFLAGS += -pipe $(cflags-y) 
KBUILD_CPPFLAGS		+= $(cflags-y)

KBUILD_CPPFLAGS		+= $(cflags-y)

KBUILD_AFLAGS		+= $(cflags-y)

KBUILD_AFLAGS		+= $(cflags-y)





LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)



libs-$(CONFIG_SUPERH32)		:= arch/sh/lib/	$(libs-y)

libs-$(CONFIG_SUPERH64)		:= arch/sh/lib64/ $(libs-y)

libs-y				+= $(LIBGCC)



PHONY += maketools FORCE

PHONY += maketools FORCE





maketools:  include/linux/version.h FORCE

maketools:  include/linux/version.h FORCE

	$(Q)$(MAKE) $(build)=arch/sh/tools arch/sh/include/asm/machtypes.h

	$(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h





all: $(KBUILD_IMAGE)

all: $(KBUILD_IMAGE)
@@ -215,4 +215,4 @@ arch/sh/lib64/syscalltab.h: arch/sh/kernel/syscalls_64.S 
	$(call filechk,gen-syscalltab)

	$(call filechk,gen-syscalltab)





CLEAN_FILES += arch/sh/lib64/syscalltab.h \

CLEAN_FILES += arch/sh/lib64/syscalltab.h \

	       arch/sh/include/asm/machtypes.h
 
	       include/asm-sh/machtypes.h