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

b98adfcc · Linus Torvalds <[email protected]> · 2006-09-27 08:49:07 -07:00

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (108 commits)
  sh: Fix occasional flush_cache_4096() stack corruption.
  sh: Calculate shm alignment at runtime.
  sh: dma-mapping compile fixes.
  sh: Initial vsyscall page support.
  sh: Clean up PAGE_SIZE definition for assembly use.
  sh: Selective flush_cache_mm() flushing.
  sh: More intelligent entry_mask/way_size calculation.
  sh: Support for L2 cache on newer SH-4A CPUs.
  sh: Update kexec support for API changes.
  sh: Optimized readsl()/writesl() support.
  sh: Report movli.l/movco.l capabilities.
  sh: CPU flags in AT_HWCAP in ELF auxvt.
  sh: Add support for 4K stacks.
  sh: Enable /proc/kcore support.
  sh: stack debugging support.
  sh: select CONFIG_EMBEDDED.
  sh: machvec rework.
  sh: Solution Engine SH7343 board support.
  sh: SH7710VoIPGW board support.
  sh: Enable verbose BUG() support.
  ...

Commit: b98adfccdf5f8dd34ae56a2d5adbe2c030bd4674
Parents: ba21fe71 · 33573c0e

Merge commit. Changes below are compared with the first parent: ba21fe71.

Changes

351 files changed · +20691 −8988

File	Status	Add	Del	Content
Documentation/sh/new-machine.txt	modified	+51	−77	View file
Documentation/sh/register-banks.txt	added	+33	−0	View file
arch/sh/Kconfig	modified	+75	−98	View file
arch/sh/Kconfig.debug	modified	+27	−9	View file
arch/sh/Makefile	modified	+18	−22	View file
arch/sh/boards/adx/irq.c	deleted	+0	−31	View before deletion
arch/sh/boards/adx/setup.c	deleted	+0	−56	View before deletion
arch/sh/boards/bigsur/irq.c	modified	+17	−30	View file
arch/sh/boards/bigsur/setup.c	modified	+20	−27	View file
arch/sh/boards/cat68701/irq.c	deleted	+0	−28	View before deletion
arch/sh/boards/cat68701/setup.c	deleted	+0	−85	View before deletion
arch/sh/boards/cqreek/Makefile	deleted	+0	−6	View before deletion
arch/sh/boards/cqreek/irq.c	deleted	+0	−128	View before deletion
arch/sh/boards/cqreek/setup.c	deleted	+0	−100	View before deletion
arch/sh/boards/dmida/Makefile	deleted	+0	−7	View before deletion
arch/sh/boards/dmida/mach.c	deleted	+0	−59	View before deletion
arch/sh/boards/dreamcast/irq.c	modified	+4	−11	View file
arch/sh/boards/dreamcast/rtc.c	modified	+11	−11	View file
arch/sh/boards/dreamcast/setup.c	modified	+15	−25	View file
arch/sh/boards/ec3104/setup.c	modified	+18	−31	View file
arch/sh/boards/harp/Makefile	deleted	+0	−8	View before deletion
arch/sh/boards/harp/irq.c	deleted	+0	−147	View before deletion
arch/sh/boards/harp/led.c	deleted	+0	−51	View before deletion
arch/sh/boards/harp/mach.c	deleted	+0	−62	View before deletion
arch/sh/boards/harp/pcidma.c	deleted	+0	−42	View before deletion
arch/sh/boards/harp/setup.c	deleted	+0	−90	View before deletion
arch/sh/boards/hp6xx/Makefile	modified	+3	−2	View file
arch/sh/boards/hp6xx/hp6xx_apm.c	added	+123	−0	View file
arch/sh/boards/hp6xx/pm.c	added	+88	−0	View file
arch/sh/boards/hp6xx/pm_wakeup.S	added	+58	−0	View file
arch/sh/boards/hp6xx/setup.c	modified	+54	−8	View file
arch/sh/boards/adx/Makefile → arch/sh/boards/landisk/Makefile	renamed	+2	−3	View file
arch/sh/boards/landisk/io.c	added	+250	−0	View file
arch/sh/boards/landisk/irq.c	added	+99	−0	View file
arch/sh/boards/landisk/landisk_pwb.c	added	+348	−0	View file
arch/sh/boards/landisk/rtc.c	added	+93	−0	View file
arch/sh/boards/landisk/setup.c	added	+177	−0	View file
arch/sh/boards/mpc1211/rtc.c	modified	+2	−2	View file
arch/sh/boards/mpc1211/setup.c	modified	+19	−52	View file
arch/sh/boards/overdrive/Makefile	deleted	+0	−8	View before deletion
arch/sh/boards/overdrive/fpga.c	deleted	+0	−133	View before deletion
arch/sh/boards/overdrive/galileo.c	deleted	+0	−587	View before deletion
arch/sh/boards/overdrive/io.c	deleted	+0	−172	View before deletion
arch/sh/boards/overdrive/irq.c	deleted	+0	−191	View before deletion
arch/sh/boards/overdrive/led.c	deleted	+0	−58	View before deletion
arch/sh/boards/overdrive/mach.c	deleted	+0	−62	View before deletion
arch/sh/boards/overdrive/pcidma.c	deleted	+0	−46	View before deletion
arch/sh/boards/overdrive/setup.c	deleted	+0	−36	View before deletion
arch/sh/boards/renesas/edosk7705/Makefile	modified	+0	−4	View file
arch/sh/boards/renesas/edosk7705/setup.c	modified	+7	−22	View file
arch/sh/boards/renesas/hs7751rvoip/Kconfig	added	+12	−0	View file
arch/sh/boards/renesas/hs7751rvoip/Makefile	modified	+1	−5	View file
arch/sh/boards/renesas/hs7751rvoip/io.c	modified	+113	−139	View file
arch/sh/boards/renesas/hs7751rvoip/irq.c	modified	+0	−6	View file
arch/sh/boards/renesas/hs7751rvoip/led.c	deleted	+0	−26	View before deletion
arch/sh/boards/renesas/hs7751rvoip/mach.c	deleted	+0	−54	View before deletion
arch/sh/boards/renesas/hs7751rvoip/setup.c	modified	+64	−30	View file
arch/sh/boards/renesas/r7780rp/Kconfig	added	+14	−0	View file
arch/sh/boards/renesas/r7780rp/Makefile	added	+6	−0	View file
arch/sh/boards/renesas/r7780rp/io.c	added	+301	−0	View file
arch/sh/boards/renesas/r7780rp/irq.c	added	+117	−0	View file
arch/sh/boards/renesas/r7780rp/led.c	added	+45	−0	View file
arch/sh/boards/renesas/r7780rp/setup.c	added	+163	−0	View file
arch/sh/boards/renesas/rts7751r2d/Kconfig	added	+12	−0	View file
arch/sh/boards/renesas/rts7751r2d/Makefile	modified	+2	−6	View file
arch/sh/boards/renesas/rts7751r2d/io.c	modified	+84	−107	View file
arch/sh/boards/renesas/rts7751r2d/irq.c	modified	+0	−6	View file
arch/sh/boards/renesas/rts7751r2d/led.c	modified	+0	−11	View file
arch/sh/boards/renesas/rts7751r2d/mach.c	deleted	+0	−69	View before deletion
arch/sh/boards/renesas/rts7751r2d/setup.c	modified	+125	−14	View file
arch/sh/boards/renesas/sh7710voipgw/Makefile	added	+1	−0	View file
arch/sh/boards/renesas/sh7710voipgw/setup.c	added	+109	−0	View file
arch/sh/boards/renesas/systemh/io.c	modified	+27	−136	View file
arch/sh/boards/renesas/systemh/irq.c	modified	+1	−9	View file
arch/sh/boards/renesas/systemh/setup.c	modified	+4	−26	View file
arch/sh/boards/saturn/setup.c	modified	+1	−13	View file
arch/sh/boards/se/7300/io.c	modified	+6	−2	View file
arch/sh/boards/se/7300/irq.c	modified	+1	−1	View file
arch/sh/boards/se/7300/led.c	modified	+2	−16	View file
arch/sh/boards/se/7300/setup.c	modified	+2	−18	View file
arch/sh/boards/se/73180/io.c	modified	+5	−1	View file
arch/sh/boards/se/73180/irq.c	modified	+0	−9	View file
arch/sh/boards/se/73180/led.c	modified	+1	−14	View file
arch/sh/boards/se/73180/setup.c	modified	+4	−18	View file
arch/sh/boards/se/7343/Makefile	added	+7	−0	View file
arch/sh/boards/se/7343/io.c	added	+275	−0	View file
arch/sh/boards/se/7343/irq.c	added	+193	−0	View file
arch/sh/boards/se/7343/led.c	added	+46	−0	View file
arch/sh/boards/se/7343/setup.c	added	+84	−0	View file
arch/sh/boards/se/770x/Makefile	modified	+2	−2	View file
arch/sh/boards/se/770x/io.c	modified	+10	−51	View file
arch/sh/boards/se/770x/irq.c	modified	+1	−1	View file
arch/sh/boards/se/770x/led.c	modified	+1	−16	View file
arch/sh/boards/se/770x/mach.c	deleted	+0	−67	View before deletion
arch/sh/boards/se/770x/setup.c	modified	+49	−16	View file
arch/sh/boards/se/7751/Makefile	modified	+2	−2	View file
arch/sh/boards/se/7751/io.c	modified	+31	−140	View file
arch/sh/boards/se/7751/irq.c	modified	+1	−1	View file
arch/sh/boards/se/7751/led.c	modified	+1	−17	View file
arch/sh/boards/se/7751/mach.c	deleted	+0	−54	View before deletion
arch/sh/boards/se/7751/setup.c	modified	+40	−69	View file
arch/sh/boards/sh03/rtc.c	modified	+4	−5	View file
arch/sh/boards/sh03/setup.c	modified	+18	−31	View file
arch/sh/boards/sh2000/setup.c	deleted	+0	−70	View before deletion
arch/sh/boards/sh2000/Makefile → arch/sh/boards/shmin/Makefile	renamed	+1	−2	View file
arch/sh/boards/shmin/setup.c	added	+41	−0	View file
arch/sh/boards/snapgear/io.c	modified	+28	−117	View file
arch/sh/boards/snapgear/rtc.c	modified	+5	−29	View file
arch/sh/boards/snapgear/setup.c	modified	+8	−107	View file
arch/sh/boards/superh/microdev/irq.c	modified	+11	−28	View file
arch/sh/boards/superh/microdev/setup.c	modified	+50	−63	View file
arch/sh/boards/cat68701/Makefile → arch/sh/boards/titan/Makefile	renamed	+2	−3	View file
arch/sh/boards/titan/io.c	added	+126	−0	View file
arch/sh/boards/titan/setup.c	added	+48	−0	View file
arch/sh/boards/unknown/setup.c	modified	+1	−12	View file
arch/sh/boot/compressed/Makefile	modified	+9	−2	View file
arch/sh/cchips/Kconfig	modified	+5	−1	View file
arch/sh/cchips/hd6446x/hd64461/io.c	modified	+7	−13	View file
arch/sh/cchips/hd6446x/hd64461/setup.c	modified	+1	−9	View file
arch/sh/cchips/hd6446x/hd64465/setup.c	modified	+0	−6	View file
arch/sh/cchips/voyagergx/irq.c	modified	+7	−16	View file
arch/sh/cchips/voyagergx/setup.c	modified	+1	−1	View file
arch/sh/configs/landisk_defconfig	added	+1373	−0	View file
arch/sh/configs/r7780rp_defconfig	added	+1099	−0	View file
arch/sh/configs/se73180_defconfig	modified	+1	−0	View file
arch/sh/configs/se7343_defconfig	added	+997	−0	View file
arch/sh/configs/sh7710voipgw_defconfig	added	+913	−0	View file
arch/sh/configs/shmin_defconfig	added	+827	−0	View file
arch/sh/configs/titan_defconfig	added	+1367	−0	View file
arch/sh/drivers/dma/Kconfig	modified	+2	−1	View file
arch/sh/drivers/dma/dma-g2.c	modified	+41	−13	View file
arch/sh/drivers/dma/dma-pvr2.c	modified	+2	−3	View file
arch/sh/drivers/dma/dma-sh.c	modified	+10	−9	View file
arch/sh/drivers/pci/Makefile	modified	+5	−1	View file
arch/sh/drivers/pci/fixups-dreamcast.c	modified	+9	−29	View file
arch/sh/drivers/pci/fixups-r7780rp.c	added	+45	−0	View file
arch/sh/drivers/pci/fixups-rts7751r2d.c	modified	+12	−12	View file
arch/sh/drivers/pci/fixups-sh03.c	modified	+4	−34	View file
arch/sh/drivers/pci/ops-bigsur.c	modified	+7	−11	View file
arch/sh/drivers/pci/ops-landisk.c	added	+68	−0	View file
arch/sh/drivers/pci/ops-r7780rp.c	added	+75	−0	View file
arch/sh/drivers/pci/ops-rts7751r2d.c	modified	+6	−7	View file
arch/sh/drivers/pci/ops-sh4.c	added	+164	−0	View file
arch/sh/drivers/pci/ops-snapgear.c	modified	+7	−14	View file
arch/sh/drivers/pci/ops-titan.c	added	+83	−0	View file
arch/sh/drivers/pci/pci-auto.c	modified	+17	−31	View file
arch/sh/drivers/pci/pci-sh4.h	added	+180	−0	View file
arch/sh/drivers/pci/pci-sh7751.c	modified	+63	−263	View file
arch/sh/drivers/pci/pci-sh7751.h	modified	+3	−171	View file
arch/sh/drivers/pci/pci-sh7780.c	added	+139	−0	View file
arch/sh/drivers/pci/pci-sh7780.h	added	+94	−0	View file
arch/sh/drivers/pci/pci-st40.c	modified	+0	−19	View file
arch/sh/drivers/pci/pci.c	modified	+88	−17	View file
arch/sh/kernel/Makefile	modified	+4	−1	View file
arch/sh/kernel/apm.c	added	+539	−0	View file
arch/sh/kernel/cf-enabler.c	modified	+4	−8	View file
arch/sh/kernel/cpu/Makefile	modified	+0	−1	View file
arch/sh/kernel/cpu/clock.c	modified	+10	−9	View file
arch/sh/kernel/cpu/init.c	modified	+20	−1	View file
arch/sh/kernel/cpu/irq/Makefile	modified	+3	−2	View file
arch/sh/kernel/cpu/irq/intc2.c	modified	+3	−3	View file
arch/sh/kernel/cpu/irq/ipr.c	modified	+7	−7	View file
arch/sh/boards/adx/irq_maskreg.c → arch/sh/kernel/cpu/irq/maskreg.c	renamed	+24	−37	View file
arch/sh/kernel/cpu/irq/pint.c	modified	+2	−6	View file
arch/sh/kernel/cpu/rtc.c	deleted	+0	−128	View before deletion
arch/sh/kernel/cpu/sh3/Makefile	modified	+12	−1	View file
arch/sh/kernel/cpu/sh3/clock-sh7706.c	added	+84	−0	View file
arch/sh/kernel/cpu/sh3/ex.S	modified	+51	−3	View file
arch/sh/kernel/cpu/sh3/probe.c	modified	+6	−0	View file
arch/sh/kernel/cpu/sh3/setup-sh7300.c	added	+43	−0	View file
arch/sh/kernel/cpu/sh3/setup-sh7705.c	added	+48	−0	View file
arch/sh/kernel/cpu/sh3/setup-sh7708.c	added	+43	−0	View file
arch/sh/kernel/cpu/sh3/setup-sh7709.c	added	+53	−0	View file
arch/sh/kernel/cpu/sh3/setup-sh7710.c	added	+43	−0	View file
arch/sh/kernel/cpu/sh4/Makefile	modified	+10	−0	View file
arch/sh/kernel/cpu/sh4/ex.S	modified	+174	−2	View file
arch/sh/kernel/cpu/sh4/probe.c	modified	+118	−20	View file
arch/sh/kernel/cpu/sh4/setup-sh4-202.c	added	+43	−0	View file
arch/sh/kernel/cpu/sh4/setup-sh73180.c	added	+43	−0	View file
arch/sh/kernel/cpu/sh4/setup-sh7343.c	added	+43	−0	View file
arch/sh/kernel/cpu/sh4/setup-sh7750.c	added	+48	−0	View file
arch/sh/kernel/cpu/sh4/setup-sh7760.c	added	+53	−0	View file
arch/sh/kernel/cpu/sh4/setup-sh7770.c	added	+53	−0	View file
arch/sh/kernel/cpu/sh4/setup-sh7780.c	added	+79	−0	View file
arch/sh/kernel/cpu/sh4/sq.c	modified	+248	−295	View file
arch/sh/kernel/early_printk.c	modified	+80	−26	View file
arch/sh/kernel/entry.S	modified	+10	−323	View file
arch/sh/kernel/head.S	modified	+35	−8	View file
arch/sh/kernel/io.c	modified	+67	−0	View file
arch/sh/kernel/irq.c	modified	+164	−4	View file
arch/sh/kernel/kgdb_stub.c	modified	+5	−28	View file
arch/sh/kernel/machine_kexec.c	modified	+0	−6	View file
arch/sh/kernel/pm.c	added	+88	−0	View file
arch/sh/kernel/process.c	modified	+13	−15	View file
arch/sh/kernel/ptrace.c	modified	+0	−1	View file
arch/sh/kernel/semaphore.c	modified	+1	−1	View file
arch/sh/kernel/setup.c	modified	+49	−68	View file
arch/sh/kernel/sh_ksyms.c	modified	+11	−21	View file
arch/sh/kernel/signal.c	modified	+83	−75	View file
arch/sh/kernel/sys_sh.c	modified	+35	−21	View file
arch/sh/kernel/syscalls.S	added	+353	−0	View file
arch/sh/kernel/time.c	modified	+44	−24	View file
arch/sh/kernel/timers/timer-tmu.c	modified	+19	−5	View file
arch/sh/kernel/traps.c	modified	+131	−53	View file
arch/sh/kernel/vmlinux.lds.S	modified	+8	−9	View file
arch/sh/kernel/vsyscall/Makefile	added	+36	−0	View file
arch/sh/kernel/vsyscall/vsyscall-note.S	added	+25	−0	View file
arch/sh/kernel/vsyscall/vsyscall-sigreturn.S	added	+39	−0	View file
arch/sh/kernel/vsyscall/vsyscall-syscall.S	added	+10	−0	View file
arch/sh/kernel/vsyscall/vsyscall-trapa.S	added	+42	−0	View file
arch/sh/kernel/vsyscall/vsyscall.c	added	+150	−0	View file
arch/sh/kernel/vsyscall/vsyscall.lds.S	added	+74	−0	View file
arch/sh/lib/checksum.S	modified	+2	−1	View file
arch/sh/lib/memcpy-sh4.S	modified	+2	−2	View file
arch/sh/lib/memset.S	modified	+1	−0	View file
arch/sh/math-emu/Makefile	added	+1	−0	View file
arch/sh/math-emu/math.c	added	+624	−0	View file
arch/sh/math-emu/sfp-util.h	added	+72	−0	View file
arch/sh/mm/Kconfig	modified	+72	−6	View file
arch/sh/mm/Makefile	modified	+11	−5	View file
arch/sh/mm/cache-debugfs.c	added	+147	−0	View file
arch/sh/mm/cache-sh4.c	modified	+548	−137	View file
arch/sh/mm/cache-sh7705.c	modified	+6	−13	View file
arch/sh/mm/clear_page.S	modified	+1	−98	View file
arch/sh/mm/consistent.c	modified	+2	−0	View file
arch/sh/mm/fault.c	modified	+45	−162	View file
arch/sh/mm/hugetlbpage.c	modified	+16	−36	View file
arch/sh/mm/init.c	modified	+29	−3	View file
arch/sh/mm/ioremap.c	modified	+16	−1	View file
arch/sh/mm/pg-nommu.c	modified	+9	−8	View file
arch/sh/mm/pg-sh4.c	modified	+14	−10	View file
arch/sh/mm/pmb.c	added	+400	−0	View file
arch/sh/mm/tlb-flush.c	added	+134	−0	View file
arch/sh/mm/tlb-sh4.c	modified	+4	−4	View file
arch/sh/oprofile/Makefile	modified	+4	−0	View file
arch/sh/tools/mach-types	modified	+7	−3	View file
drivers/char/Kconfig	modified	+1	−1	View file
drivers/char/watchdog/Kconfig	modified	+8	−0	View file
drivers/char/watchdog/shwdt.c	modified	+75	−35	View file
drivers/input/touchscreen/hp680_ts_input.c	modified	+0	−14	View file
drivers/net/stnic.c	modified	+1	−1	View file
drivers/rtc/Kconfig	modified	+10	−0	View file
drivers/rtc/Makefile	modified	+1	−0	View file
drivers/rtc/rtc-sh.c	added	+467	−0	View file
drivers/serial/Kconfig	modified	+7	−2	View file
drivers/serial/sh-sci.c	modified	+421	−725	View file
drivers/serial/sh-sci.h	modified	+46	−44	View file
drivers/video/backlight/hp680_bl.c	modified	+2	−2	View file
drivers/video/console/Kconfig	modified	+1	−1	View file
drivers/video/hitfb.c	modified	+182	−47	View file
drivers/video/pvr2fb.c	modified	+12	−10	View file
include/asm-sh/addrspace.h	modified	+8	−0	View file
include/asm-sh/adx/io.h	deleted	+0	−86	View before deletion
include/asm-sh/apm.h	added	+46	−0	View file
include/asm-sh/atomic.h	modified	+97	−9	View file
include/asm-sh/auxvec.h	modified	+14	−0	View file
include/asm-sh/bitops.h	modified	+8	−8	View file
include/asm-sh/bugs.h	modified	+4	−0	View file
include/asm-sh/cache.h	modified	+18	−12	View file
include/asm-sh/cacheflush.h	modified	+3	−0	View file
include/asm-sh/cat68701/io.h	deleted	+0	−22	View before deletion
include/asm-sh/checksum.h	modified	+2	−0	View file
include/asm-sh/cpu-features.h	added	+24	−0	View file
include/asm-sh/cpu-sh3/cache.h	modified	+1	−3	View file
include/asm-sh/cpu-sh3/cacheflush.h	modified	+16	−36	View file
include/asm-sh/cpu-sh3/freq.h	modified	+4	−0	View file
include/asm-sh/cpu-sh3/mmu_context.h	modified	+6	−2	View file
include/asm-sh/cpu-sh3/shmparam.h	deleted	+0	−16	View before deletion
include/asm-sh/cpu-sh3/timer.h	modified	+5	−3	View file
include/asm-sh/cpu-sh3/ubc.h	modified	+14	−1	View file
include/asm-sh/cpu-sh4/addrspace.h	modified	+3	−0	View file
include/asm-sh/cpu-sh4/cache.h	modified	+2	−0	View file
include/asm-sh/cpu-sh4/cacheflush.h	modified	+12	−24	View file
include/asm-sh/cpu-sh4/dma-sh7780.h	added	+39	−0	View file
include/asm-sh/cpu-sh4/dma.h	modified	+8	−3	View file
include/asm-sh/cpu-sh4/shmparam.h	deleted	+0	−19	View before deletion
include/asm-sh/cpu-sh4/sq.h	modified	+5	−18	View file
include/asm-sh/cqreek/cqreek.h	deleted	+0	−27	View before deletion
include/asm-sh/dma-mapping.h	modified	+25	−17	View file
include/asm-sh/dma.h	modified	+1	−0	View file
include/asm-sh/dmida/io.h	deleted	+0	−10	View before deletion
include/asm-sh/elf.h	modified	+26	−4	View file
include/asm-sh/fixmap.h	modified	+1	−1	View file
include/asm-sh/flat.h	modified	+1	−1	View file
include/asm-sh/harp/harp.h	deleted	+0	−43	View before deletion
include/asm-sh/harp/io.h	deleted	+0	−10	View before deletion
include/asm-sh/hd64461/hd64461.h → include/asm-sh/hd64461.h	renamed	+31	−25	View file
include/asm-sh/hd64461/io.h	deleted	+0	−43	View before deletion
include/asm-sh/hp6xx/hp6xx.h	modified	+51	−2	View file
include/asm-sh/hp6xx/io.h	modified	+1	−1	View file
include/asm-sh/hs7751rvoip/hs7751rvoip.h	modified	+9	−2	View file
include/asm-sh/io.h	modified	+16	−0	View file
include/asm-sh/irq-sh73180.h	modified	+0	−2	View file
include/asm-sh/irq-sh7343.h	added	+317	−0	View file
include/asm-sh/irq-sh7780.h	modified	+0	−5	View file
include/asm-sh/irq.h	modified	+132	−5	View file
include/asm-sh/kexec.h	modified	+4	−5	View file
include/asm-sh/kgdb.h	modified	+15	−0	View file
include/asm-sh/landisk/gio.h	added	+45	−0	View file
include/asm-sh/landisk/ide.h	added	+14	−0	View file
include/asm-sh/landisk/iodata_landisk.h	added	+79	−0	View file
include/asm-sh/machvec.h	modified	+5	−2	View file
include/asm-sh/mc146818rtc.h	modified	+0	−169	View file
include/asm-sh/mmu.h	modified	+63	−14	View file
include/asm-sh/mmu_context.h	modified	+7	−8	View file
include/asm-sh/overdrive/fpga.h	deleted	+0	−15	View before deletion
include/asm-sh/overdrive/gt64111.h	deleted	+0	−109	View before deletion
include/asm-sh/overdrive/io.h	deleted	+0	−39	View before deletion
include/asm-sh/overdrive/overdrive.h	deleted	+0	−88	View before deletion
include/asm-sh/page.h	modified	+21	−12	View file
include/asm-sh/pci.h	modified	+32	−12	View file
include/asm-sh/pgalloc.h	modified	+4	−33	View file
include/asm-sh/pgtable.h	modified	+96	−58	View file
include/asm-sh/cpu-sh2/shmparam.h → include/asm-sh/pm.h	renamed	+9	−8	View file
include/asm-sh/processor.h	modified	+34	−18	View file
include/asm-sh/r7780rp/ide.h	added	+8	−0	View file
include/asm-sh/r7780rp/r7780rp.h	added	+177	−0	View file
include/asm-sh/rtc.h	modified	+2	−23	View file
include/asm-sh/rts7751r2d/rts7751r2d.h	modified	+0	−2	View file
include/asm-sh/scatterlist.h	modified	+9	−0	View file
include/asm-sh/sci.h	added	+34	−0	View file
include/asm-sh/se/se.h → include/asm-sh/se.h	renamed	+3	−0	View file
include/asm-sh/se/io.h	deleted	+0	−35	View before deletion
include/asm-sh/se7300/se7300.h → include/asm-sh/se7300.h	renamed	+3	−0	View file
include/asm-sh/se7300/io.h	deleted	+0	−29	View before deletion
include/asm-sh/se73180/se73180.h → include/asm-sh/se73180.h	renamed	+3	−0	View file
include/asm-sh/se73180/io.h	deleted	+0	−32	View before deletion
include/asm-sh/se7343.h	added	+82	−0	View file
include/asm-sh/se7751/se7751.h → include/asm-sh/se7751.h	renamed	+3	−0	View file
include/asm-sh/se7751/io.h	deleted	+0	−42	View before deletion
include/asm-sh/setup.h	modified	+2	−0	View file
include/asm-sh/sfp-machine.h	added	+86	−0	View file
include/asm-sh/sh03/io.h	modified	+1	−9	View file
include/asm-sh/sh2000/sh2000.h	deleted	+0	−8	View before deletion
include/asm-sh/shmin/shmin.h	added	+9	−0	View file
include/asm-sh/shmparam.h	modified	+17	−3	View file
include/asm-sh/se/smc37c93x.h → include/asm-sh/smc37c93x.h	renamed	+0	−0	View file
include/asm-sh/smp.h	modified	+0	−5	View file
include/asm-sh/snapgear/io.h → include/asm-sh/snapgear.h	renamed	+9	−22	View file
include/asm-sh/system.h	modified	+146	−53	View file
include/asm-sh/systemh/io.h	deleted	+0	−43	View before deletion
include/asm-sh/systemh/7751systemh.h → include/asm-sh/systemh7751.h	renamed	+3	−0	View file
include/asm-sh/thread_info.h	modified	+36	−7	View file
include/asm-sh/timer.h	modified	+2	−0	View file
include/asm-sh/titan.h	added	+43	−0	View file
include/asm-sh/uaccess.h	modified	+28	−51	View file
include/asm-sh/unistd.h	modified	+34	−10	View file
include/asm-sh/rts7751r2d/voyagergx_reg.h → include/asm-sh/voyagergx.h	renamed	+1	−1	View file
include/asm-sh/watchdog.h	modified	+0	−3	View file
lib/Kconfig.debug	modified	+2	−2	View file
sound/oss/sh_dac_audio.c	modified	+34	−26	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/sh/new-machine.txt

View file

diff --git a/Documentation/sh/new-machine.txt b/Documentation/sh/new-machine.txt
index eb2dd2e..73988e0 100644
--- a/Documentation/sh/new-machine.txt
+++ b/Documentation/sh/new-machine.txt
@@ -41,11 +41,6 @@ Board-specific code:
         |
 	.. more boards here ...
 
-It should also be noted that each board is required to have some certain
-headers. At the time of this writing, io.h is the only thing that needs
-to be provided for each board, and can generally just reference generic
-functions (with the exception of isa_port2addr).
-
 Next, for companion chips:
 .
 `-- arch
@@ -104,12 +99,13 @@ and then populate that with sub-directories for each member of the family.
 Both the Solution Engine and the hp6xx boards are an example of this.
 
 After you have setup your new arch/sh/boards/ directory, remember that you
-also must add a directory in include/asm-sh for headers localized to this
-board. In order to interoperate seamlessly with the build system, it's best
-to have this directory the same as the arch/sh/boards/ directory name,
-though if your board is again part of a family, the build system has ways
-of dealing with this, and you can feel free to name the directory after
-the family member itself.
+should also add a directory in include/asm-sh for headers localized to this
+board (if there are going to be more than one). In order to interoperate
+seamlessly with the build system, it's best to have this directory the same
+as the arch/sh/boards/ directory name, though if your board is again part of
+a family, the build system has ways of dealing with this (via incdir-y
+overloading), and you can feel free to name the directory after the family
+member itself.
 
 There are a few things that each board is required to have, both in the
 arch/sh/boards and the include/asm-sh/ heirarchy. In order to better
@@ -122,6 +118,7 @@ might look something like:
  * arch/sh/boards/vapor/setup.c - Setup code for imaginary board
  */
 #include <linux/init.h>
+#include <asm/rtc.h> /* for board_time_init() */
 
 const char *get_system_type(void)
 {
@@ -152,79 +149,57 @@ int __init platform_setup(void)
 }
 
 Our new imaginary board will also have to tie into the machvec in order for it
-to be of any use. Currently the machvec is slowly on its way out, but is still
-required for the time being. As such, let us take a look at what needs to be
-done for the machvec assignment.
+to be of any use.
 
 machvec functions fall into a number of categories:
 
  - I/O functions to IO memory (inb etc) and PCI/main memory (readb etc).
- - I/O remapping functions (ioremap etc)
- - some initialisation functions
- - a 'heartbeat' function
- - some miscellaneous flags
-
-The tree can be built in two ways:
- - as a fully generic build. All drivers are linked in, and all functions
-   go through the machvec
- - as a machine specific build. In this case only the required drivers
-   will be linked in, and some macros may be redefined to not go through
-   the machvec where performance is important (in particular IO functions).
-
-There are three ways in which IO can be performed:
- - none at all. This is really only useful for the 'unknown' machine type,
-   which us designed to run on a machine about which we know nothing, and
-   so all all IO instructions do nothing.
- - fully custom. In this case all IO functions go to a machine specific
-   set of functions which can do what they like
- - a generic set of functions. These will cope with most situations,
-   and rely on a single function, mv_port2addr, which is called through the
-   machine vector, and converts an IO address into a memory address, which
-   can be read from/written to directly.
-
-Thus adding a new machine involves the following steps (I will assume I am
-adding a machine called vapor):
-
- - add a new file include/asm-sh/vapor/io.h which contains prototypes for
+ - I/O mapping functions (ioport_map, ioport_unmap, etc).
+ - a 'heartbeat' function.
+ - PCI and IRQ initialization routines.
+ - Consistent allocators (for boards that need special allocators,
+   particularly for allocating out of some board-specific SRAM for DMA
+   handles).
+
+There are machvec functions added and removed over time, so always be sure to
+consult include/asm-sh/machvec.h for the current state of the machvec.
+
+The kernel will automatically wrap in generic routines for undefined function
+pointers in the machvec at boot time, as machvec functions are referenced
+unconditionally throughout most of the tree. Some boards have incredibly
+sparse machvecs (such as the dreamcast and sh03), whereas others must define
+virtually everything (rts7751r2d).
+
+Adding a new machine is relatively trivial (using vapor as an example):
+
+If the board-specific definitions are quite minimalistic, as is the case for
+the vast majority of boards, simply having a single board-specific header is
+sufficient.
+
+ - add a new file include/asm-sh/vapor.h which contains prototypes for
    any machine specific IO functions prefixed with the machine name, for
    example vapor_inb. These will be needed when filling out the machine
    vector.
 
-   This is the minimum that is required, however there are ample
-   opportunities to optimise this. In particular, by making the prototypes
-   inline function definitions, it is possible to inline the function when
-   building machine specific versions. Note that the machine vector
-   functions will still be needed, so that a module built for a generic
-   setup can be loaded.
-
- - add a new file arch/sh/boards/vapor/mach.c. This contains the definition
-   of the machine vector. When building the machine specific version, this
-   will be the real machine vector (via an alias), while in the generic
-   version is used to initialise the machine vector, and then freed, by
-   making it initdata. This should be defined as:
-
-     struct sh_machine_vector mv_vapor __initmv = {
-       .mv_name = "vapor",
-     }
-     ALIAS_MV(vapor)
-
- - finally add a file arch/sh/boards/vapor/io.c, which contains
-   definitions of the machine specific io functions.
-
-A note about initialisation functions. Three initialisation functions are
-provided in the machine vector:
- - mv_arch_init - called very early on from setup_arch
- - mv_init_irq - called from init_IRQ, after the generic SH interrupt
-   initialisation
- - mv_init_pci - currently not used
-
-Any other remaining functions which need to be called at start up can be
-added to the list using the __initcalls macro (or module_init if the code
-can be built as a module). Many generic drivers probe to see if the device
-they are targeting is present, however this may not always be appropriate,
-so a flag can be added to the machine vector which will be set on those
-machines which have the hardware in question, reducing the probe to a
-single conditional.
+   Note that these prototypes are generated automatically by setting
+   __IO_PREFIX to something sensible. A typical example would be:
+
+	#define __IO_PREFIX vapor
+   	#include <asm/io_generic.h>
+
+   somewhere in the board-specific header. Any boards being ported that still
+   have a legacy io.h should remove it entirely and switch to the new model.
+
+ - Add machine vector definitions to the board's setup.c. At a bare minimum,
+   this must be defined as something like:
+
+	struct sh_machine_vector mv_vapor __initmv = {
+		.mv_name = "vapor",
+	};
+	ALIAS_MV(vapor)
+
+ - finally add a file arch/sh/boards/vapor/io.c, which contains definitions of
+   the machine specific io functions (if there are enough to warrant it).
 
 3. Hooking into the Build System
 ================================
@@ -303,4 +278,3 @@ which will in turn copy the defconfig for this board, run it through
 oldconfig (prompting you for any new options since the time of creation),
 and start you on your way to having a functional kernel for your new
 board.
-

Documentation/sh/register-banks.txt

View file

diff --git a/Documentation/sh/register-banks.txt b/Documentation/sh/register-banks.txt
new file mode 100644
index 0000000..a6719f2
--- /dev/null
+++ b/Documentation/sh/register-banks.txt
@@ -0,0 +1,33 @@
+	Notes on register bank usage in the kernel
+	==========================================
+
+Introduction
+------------
+
+The SH-3 and SH-4 CPU families traditionally include a single partial register
+bank (selected by SR.RB, only r0 ... r7 are banked), whereas other families
+may have more full-featured banking or simply no such capabilities at all.
+
+SR.RB banking
+-------------
+
+In the case of this type of banking, banked registers are mapped directly to
+r0 ... r7 if SR.RB is set to the bank we are interested in, otherwise ldc/stc
+can still be used to reference the banked registers (as r0_bank ... r7_bank)
+when in the context of another bank. The developer must keep the SR.RB value
+in mind when writing code that utilizes these banked registers, for obvious
+reasons. Userspace is also not able to poke at the bank1 values, so these can
+be used rather effectively as scratch registers by the kernel.
+
+Presently the kernel uses several of these registers.
+
+	- r0_bank, r1_bank (referenced as k0 and k1, used for scratch
+	  registers when doing exception handling).
+	- r2_bank (used to track the EXPEVT/INTEVT code)
+		- Used by do_IRQ() and friends for doing irq mapping based off
+		  of the interrupt exception vector jump table offset
+	- r6_bank (global interrupt mask)
+		- The SR.IMASK interrupt handler makes use of this to set the
+		  interrupt priority level (used by local_irq_enable())
+	- r7_bank (current)
+

arch/sh/Kconfig

View file

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 1a0db1d..1cc5c9b 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -8,6 +8,7 @@ mainmenu "Linux/SuperH Kernel Configuration"
 config SUPERH
 	bool
 	default y
+	select EMBEDDED
 	help
 	  The SuperH is a RISC processor targeted for use in embedded systems
 	  and consumer electronics; it was also used in the Sega Dreamcast
@@ -51,18 +52,23 @@ source "init/Kconfig"
 
 menu "System type"
 
+config SOLUTION_ENGINE
+	bool
+
 choice
 	prompt "SuperH system type"
 	default SH_UNKNOWN
 
 config SH_SOLUTION_ENGINE
 	bool "SolutionEngine"
+	select SOLUTION_ENGINE
 	help
 	  Select SolutionEngine if configuring for a Hitachi SH7709
 	  or SH7750 evaluation board.
 
 config SH_7751_SOLUTION_ENGINE
 	bool "SolutionEngine7751"
+	select SOLUTION_ENGINE
 	select CPU_SUBTYPE_SH7751
 	help
 	  Select 7751 SolutionEngine if configuring for a Hitachi SH7751
@@ -70,17 +76,27 @@ config SH_7751_SOLUTION_ENGINE
 
 config SH_7300_SOLUTION_ENGINE
 	bool "SolutionEngine7300"
+	select SOLUTION_ENGINE
 	select CPU_SUBTYPE_SH7300
 	help
-	  Select 7300 SolutionEngine if configuring for a Hitachi SH7300(SH-Mobile V)
-	  evaluation board.
+	  Select 7300 SolutionEngine if configuring for a Hitachi
+	  SH7300(SH-Mobile V) evaluation board.
+
+config SH_7343_SOLUTION_ENGINE
+	bool "SolutionEngine7343"
+	select SOLUTION_ENGINE
+	select CPU_SUBTYPE_SH7343
+	help
+	  Select 7343 SolutionEngine if configuring for a Hitachi
+	  SH7343 (SH-Mobile 3AS) evaluation board.
 
 config SH_73180_SOLUTION_ENGINE
        bool "SolutionEngine73180"
-       select CPU_SUBTYPE_SH73180
-       help
-         Select 73180 SolutionEngine if configuring for a Hitachi SH73180(SH-Mobile 3)
-         evaluation board.
+	select SOLUTION_ENGINE
+	select CPU_SUBTYPE_SH73180
+	help
+	  Select 73180 SolutionEngine if configuring for a Hitachi
+	  SH73180(SH-Mobile 3) evaluation board.
 
 config SH_7751_SYSTEMH
 	bool "SystemH7751R"
@@ -89,12 +105,6 @@ config SH_7751_SYSTEMH
 	  Select SystemH if you are configuring for a Renesas SystemH
 	  7751R evaluation board.
 
-config SH_STB1_HARP
-	bool "STB1_Harp"
-
-config SH_STB1_OVERDRIVE
-	bool "STB1_Overdrive"
-
 config SH_HP6XX
 	bool "HP6XX"
 	help
@@ -102,19 +112,6 @@ config SH_HP6XX
 	  More information (hardware only) at
 	  <http://www.hp.com/jornada/>.
 
-config SH_CQREEK
-	bool "CqREEK"
-	help
-	  Select CqREEK if configuring for a CqREEK SH7708 or SH7750.
-	  More information at
-	  <http://sources.redhat.com/ecos/hardware.html#SuperH>.
-
-config SH_DMIDA
-	bool "DMIDA"
-	help
-	  Select DMIDA if configuring for a DataMyte 4000 Industrial
-	  Digital Assistant. More information at <http://www.dmida.com/>.
-
 config SH_EC3104
 	bool "EC3104"
 	help
@@ -136,25 +133,9 @@ config SH_DREAMCAST
 	  <http://www.m17n.org/linux-sh/dreamcast/>.  There is a
 	  Dreamcast project is at <http://linuxdc.sourceforge.net/>.
 
-config SH_CAT68701
-	bool "CAT68701"
-
 config SH_BIGSUR
 	bool "BigSur"
 
-config SH_SH2000
-	bool "SH2000"
-	select CPU_SUBTYPE_SH7709
-	help
-	  SH-2000 is a single-board computer based around SH7709A chip
-	  intended for embedded applications.
-	  It has an Ethernet interface (CS8900A), direct connected
-	  Compact Flash socket, three serial ports and PC-104 bus.
-	  More information at <http://sh2000.sh-linux.org>.
-
-config SH_ADX
-	bool "ADX"
-
 config SH_MPC1211
 	bool "Interface MPC1211"
 	help
@@ -184,6 +165,13 @@ config SH_HS7751RVOIP
 	  Select HS7751RVOIP if configuring for a Renesas Technology
 	  Sales VoIP board.
 
+config SH_7710VOIPGW
+	bool "SH7710-VOIP-GW"
+	select CPU_SUBTYPE_SH7710
+	help
+	  Select this option to build a kernel for the SH7710 based
+	  VOIP GW.
+
 config SH_RTS7751R2D
 	bool "RTS7751R2D"
 	select CPU_SUBTYPE_SH7751R
@@ -222,6 +210,12 @@ config SH_TITAN
 	  Select Titan if you are configuring for a Nimble Microsystems
 	  NetEngine NP51R.
 
+config SH_SHMIN
+	bool "SHMIN"
+	select CPU_SUBTYPE_SH7706
+	help
+	  Select SHMIN if configureing for the SHMIN board
+
 config SH_UNKNOWN
 	bool "BareCPU"
 	help
@@ -238,35 +232,9 @@ endchoice
 
 source "arch/sh/mm/Kconfig"
 
-config MEMORY_START
-	hex "Physical memory start address"
-	default "0x08000000"
-	---help---
-	  Computers built with Hitachi SuperH processors always
-	  map the ROM starting at address zero.  But the processor
-	  does not specify the range that RAM takes.
-
-	  The physical memory (RAM) start address will be automatically
-	  set to 08000000. Other platforms, such as the Solution Engine
-	  boards typically map RAM at 0C000000.
-
-	  Tweak this only when porting to a new machine which does not
-	  already have a defconfig. Changing it from the known correct
-	  value on any of the known systems will only lead to disaster.
-
-config MEMORY_SIZE
-	hex "Physical memory size"
-	default "0x00400000"
-	help
-	  This sets the default memory size assumed by your SH kernel. It can
-	  be overridden as normal by the 'mem=' argument on the kernel command
-	  line. If unsure, consult your board specifications or just leave it
-	  as 0x00400000 which was the default value before this became
-	  configurable.
-
 config CF_ENABLER
 	bool "Compact Flash Enabler support"
-	depends on SH_ADX || SH_SOLUTION_ENGINE || SH_UNKNOWN || SH_CAT68701 || SH_SH03
+	depends on SH_SOLUTION_ENGINE || SH_UNKNOWN || SH_SH03
 	---help---
 	  Compact Flash is a small, removable mass storage device introduced
 	  in 1994 originally as a PCMCIA device.  If you say `Y' here, you
@@ -294,7 +262,7 @@ config CF_AREA5
 	  - "Area5" if CompactFlash is connected to Area 5 (0x14000000)
 	  - "Area6" if it is connected to Area 6 (0x18000000)
 
-	  "Area6" will work for most boards. For ADX, select "Area5".
+	  "Area6" will work for most boards.
 
 config CF_AREA6
 	bool "Area6"
@@ -316,19 +284,6 @@ config CPU_LITTLE_ENDIAN
 	  endian byte order. These modes require different kernels. Say Y if
 	  your machine is little endian, N if it's a big endian machine.
 
-# The SH7750 RTC module is disabled in the Dreamcast
-config SH_RTC
-	bool
-	depends on !SH_DREAMCAST && !SH_SATURN && !SH_7300_SOLUTION_ENGINE && \
-		   !SH_73180_SOLUTION_ENGINE && !SH_LANDISK && \
-		   !SH_R7780RP
-	default y
-	help
-	  Selecting this option will allow the Linux kernel to emulate
-	  PC's RTC.
-
-	  If unsure, say N.
-
 config SH_FPU
 	bool "FPU support"
 	depends on !CPU_SH3
@@ -339,14 +294,22 @@ config SH_FPU
 
 	  This option must be set in order to enable the FPU.
 
+config SH_FPU_EMU
+	bool "FPU emulation support"
+	depends on !SH_FPU && EXPERIMENTAL
+	default n
+	help
+	  Selecting this option will enable support for software FPU emulation.
+	  Most SH-3 users will want to say Y here, whereas most SH-4 users will
+	  want to say N.
+
 config SH_DSP
 	bool "DSP support"
-	depends on !CPU_SH4
-	default y
+	default y if SH4AL_DSP || !CPU_SH4
+	default n
 	help
 	  Selecting this option will enable support for SH processors that
-	  have DSP units (ie, SH2-DSP and SH3-DSP). It is safe to say Y here
-	  by default, as the existance of the DSP will be probed at runtime.
+	  have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
 
 	  This option must be set in order to enable the DSP.
 
@@ -373,6 +336,9 @@ config CPU_HAS_INTEVT
 config CPU_HAS_PINT_IRQ
 	bool
 
+config CPU_HAS_MASKREG_IRQ
+	bool
+
 config CPU_HAS_INTC2_IRQ
 	bool
 
@@ -400,16 +366,19 @@ config SH_TMU
 
 endmenu
 
-#source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"
+source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"
+
+source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
 
-#source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
+source "arch/sh/boards/renesas/r7780rp/Kconfig"
 
 config SH_PCLK_FREQ
 	int "Peripheral clock frequency (in Hz)"
 	default "50000000" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7780
 	default "60000000" if CPU_SUBTYPE_SH7751
-	default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || CPU_SUBTYPE_SH7760
-	default "27000000" if CPU_SUBTYPE_SH73180
+	default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || \
+			      CPU_SUBTYPE_SH7760
+	default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343
 	default "66000000" if CPU_SUBTYPE_SH4_202
 	help
 	  This option is used to specify the peripheral clock frequency.
@@ -440,10 +409,8 @@ source "arch/sh/cchips/Kconfig"
 
 config HEARTBEAT
 	bool "Heartbeat LED"
-	depends on SH_MPC1211 || SH_SH03 || SH_CAT68701 || \
-		   SH_STB1_HARP || SH_STB1_OVERDRIVE || SH_BIGSUR || \
-		   SH_7751_SOLUTION_ENGINE || SH_7300_SOLUTION_ENGINE || \
-		   SH_73180_SOLUTION_ENGINE || SH_SOLUTION_ENGINE || \
+	depends on SH_MPC1211 || SH_SH03 || \
+		   SH_BIGSUR || SOLUTION_ENGINE || \
 		   SH_RTS7751R2D || SH_SH4202_MICRODEV || SH_LANDISK
 	help
 	  Use the power-on LED on your machine as a load meter.  The exact
@@ -459,6 +426,8 @@ config ISA_DMA_API
 
 menu "Kernel features"
 
+source kernel/Kconfig.hz
+
 config KEXEC
 	bool "kexec system call (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
@@ -476,10 +445,6 @@ config KEXEC
 	  support.  As of this writing the exact hardware interface is
 	  strongly in flux, so no good recommendation can be made.
 
-config PREEMPT
-	bool "Preemptible Kernel (EXPERIMENTAL)"
-	depends on EXPERIMENTAL
-
 config SMP
 	bool "Symmetric multi-processing support"
 	---help---
@@ -515,6 +480,8 @@ config NR_CPUS
 	  This is purely to save memory - each supported CPU adds
 	  approximately eight kilobytes to the kernel image.
 
+source "kernel/Kconfig.preempt"
+
 config CPU_HAS_SR_RB
 	bool "CPU has SR.RB"
 	depends on CPU_SH3 || CPU_SH4
@@ -636,6 +603,16 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+menu "Power management options (EXPERIMENTAL)"
+depends on EXPERIMENTAL
+
+source kernel/power/Kconfig
+
+config APM
+	bool "Advanced Power Management Emulation"
+	depends on PM
+endmenu
+
 source "net/Kconfig"
 
 source "drivers/Kconfig"

arch/sh/Kconfig.debug

View file

diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index 8fb31ab..48479e0 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -30,8 +30,35 @@ config EARLY_PRINTK
 	  when the kernel may crash or hang before the serial console is
 	  initialised. If unsure, say N.
 
+config DEBUG_STACKOVERFLOW
+	bool "Check for stack overflows"
+	depends on DEBUG_KERNEL
+	help
+	  This option will cause messages to be printed if free stack space
+	  drops below a certain limit.
+
+config DEBUG_STACK_USAGE
+	bool "Stack utilization instrumentation"
+	depends on DEBUG_KERNEL
+	help
+	  Enables the display of the minimum amount of free stack which each
+	  task has ever had available in the sysrq-T and sysrq-P debug output.
+
+	  This option will slow down process creation somewhat.
+
+config 4KSTACKS
+	bool "Use 4Kb for kernel stacks instead of 8Kb"
+	depends on DEBUG_KERNEL
+	help
+	  If you say Y here the kernel will use a 4Kb stacksize for the
+	  kernel stack attached to each process/thread. This facilitates
+	  running more threads on a system and also reduces the pressure
+	  on the VM subsystem for higher order allocations. This option
+	  will also use IRQ stacks to compensate for the reduced stackspace.
+
 config KGDB
 	bool "Include KGDB kernel debugger"
+	select FRAME_POINTER
 	help
 	  Include in-kernel hooks for kgdb, the Linux kernel source level
 	  debugger.  See <http://kgdb.sourceforge.net/> for more information.
@@ -112,13 +139,4 @@ endchoice
 
 endmenu
 
-config FRAME_POINTER
-	bool "Compile the kernel with frame pointers"
-	default y if KGDB