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

Commit 6b426e78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  [PARISC] MAINTAINERS
  [PARISC] Make ioremap default to _nocache
  [PARISC] Add new entries to the syscall table
  [PARISC] Further work for multiple page sizes
  [PARISC] Fix up hil_kbd.c mismerge
  [PARISC] defconfig updates
  [PARISC] Document that we tolerate "Relaxed Ordering"
  [PARISC] Misc. janitorial work
  [PARISC] EISA regions must be mapped NO_CACHE
  [PARISC] OSS ad1889: Match register names with ALSA driver
parents cb6aef28 223232de

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -2065,8 +2065,12 @@ P: Matthew Wilcox 
M:	matthew@wil.cx

P:	Grant Grundler

M:	grundler@parisc-linux.org

P:	Kyle McMartin

M:	kyle@parisc-linux.org

L:	parisc-linux@parisc-linux.org

W:	http://www.parisc-linux.org/

T:	git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git

T:	cvs cvs.parisc-linux.org:/var/cvs/linux-2.6

S:	Maintained



PCI ERROR RECOVERY

arch/parisc/Kconfig

+31 −0
Original line number Diff line number Diff line
@@ -138,6 +138,37 @@ config 64BIT 
	  enable this option otherwise. The 64bit kernel is significantly bigger

	  and slower than the 32bit one.



choice

	prompt "Kernel page size"

	default PARISC_PAGE_SIZE_4KB  if !64BIT

	default PARISC_PAGE_SIZE_4KB  if 64BIT

#	default PARISC_PAGE_SIZE_16KB if 64BIT



config PARISC_PAGE_SIZE_4KB

	bool "4KB"

	help

	  This lets you select the page size of the kernel.  For best

	  performance, a page size of 16KB is recommended.  For best

	  compatibility with 32bit applications, a page size of 4KB should be

	  selected (the vast majority of 32bit binaries work perfectly fine

	  with a larger page size).



	  4KB                For best 32bit compatibility

	  16KB               For best performance

	  64KB               For best performance, might give more overhead.



	  If you don't know what to do, choose 4KB.



config PARISC_PAGE_SIZE_16KB

	bool "16KB (EXPERIMENTAL)"

	depends on PA8X00 && EXPERIMENTAL



config PARISC_PAGE_SIZE_64KB

	bool "64KB (EXPERIMENTAL)"

	depends on PA8X00 && EXPERIMENTAL



endchoice



config SMP

	bool "Symmetric multi-processing support"

	---help---

arch/parisc/defconfig

+315 −179
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.16-pa6

# Sun Mar 26 19:50:07 2006

# Linux kernel version: 2.6.16-pa10

# Sun Apr  2 15:26:38 2006

#

CONFIG_PARISC=y

CONFIG_MMU=y
@@ -25,7 +25,7 @@ CONFIG_LOCALVERSION="" 
# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

# CONFIG_POSIX_MQUEUE is not set

CONFIG_POSIX_MQUEUE=y

# CONFIG_BSD_PROCESS_ACCT is not set

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set
@@ -35,7 +35,7 @@ CONFIG_INITRAMFS_SOURCE="" 
CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_EMBEDDED is not set

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

CONFIG_KALLSYMS_ALL=y

# CONFIG_KALLSYMS_EXTRA_PASS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y
@@ -57,7 +57,13 @@ CONFIG_BASE_SMALL=0 
#

# Loadable module support

#

# CONFIG_MODULES is not set

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_OBSOLETE_MODPARM=y

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y



#

# Block layer
@@ -79,16 +85,19 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
#

# Processor type and features

#

CONFIG_PA7000=y

# CONFIG_PA7100LC is not set

# CONFIG_PA7000 is not set

CONFIG_PA7100LC=y

# CONFIG_PA7200 is not set

# CONFIG_PA7300LC is not set

# CONFIG_PA8X00 is not set

CONFIG_PA11=y

CONFIG_PARISC_PAGE_SIZE_4KB=y

# CONFIG_PARISC_PAGE_SIZE_16KB is not set

# CONFIG_PARISC_PAGE_SIZE_64KB is not set

# CONFIG_SMP is not set

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_PREEMPT_NONE=y

# CONFIG_PREEMPT_VOLUNTARY is not set

# CONFIG_PREEMPT_NONE is not set

CONFIG_PREEMPT_VOLUNTARY=y

# CONFIG_PREEMPT is not set

# CONFIG_HZ_100 is not set

CONFIG_HZ_250=y
@@ -108,7 +117,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096 
# Bus options (PCI, PCMCIA, EISA, GSC, ISA)

#

CONFIG_GSC=y

CONFIG_HPPB=y

# CONFIG_HPPB is not set

CONFIG_IOMMU_CCIO=y

CONFIG_GSC_LASI=y

CONFIG_GSC_WAX=y
@@ -126,7 +135,25 @@ CONFIG_IOMMU_SBA=y 
#

# PCCARD (PCMCIA/CardBus) support

#

# CONFIG_PCCARD is not set

CONFIG_PCCARD=y

# CONFIG_PCMCIA_DEBUG is not set

CONFIG_PCMCIA=y

CONFIG_PCMCIA_LOAD_CIS=y

CONFIG_PCMCIA_IOCTL=y

CONFIG_CARDBUS=y



#

# PC-card bridges

#

CONFIG_YENTA=y

CONFIG_YENTA_O2=y

CONFIG_YENTA_RICOH=y

CONFIG_YENTA_TI=y

CONFIG_YENTA_ENE_TUNE=y

CONFIG_YENTA_TOSHIBA=y

CONFIG_PD6729=y

CONFIG_I82092=y

CONFIG_PCCARD_NONSTATIC=y



#

# PCI Hotplug Support
@@ -145,7 +172,7 @@ CONFIG_PDC_STABLE=y 
# Executable file formats

#

CONFIG_BINFMT_ELF=y

# CONFIG_BINFMT_MISC is not set

CONFIG_BINFMT_MISC=m



#

# Networking
@@ -159,13 +186,15 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_XFRM=y

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

CONFIG_IP_PNP=y

# CONFIG_IP_PNP_DHCP is not set

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

# CONFIG_IP_PNP_RARP is not set

# CONFIG_NET_IPIP is not set
@@ -173,19 +202,20 @@ CONFIG_IP_PNP_BOOTP=y 
# CONFIG_IP_MROUTE is not set

# CONFIG_ARPD is not set

# CONFIG_SYN_COOKIES is not set

# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_TUNNEL is not set

# CONFIG_INET_DIAG is not set

CONFIG_INET_TUNNEL=m

CONFIG_INET_DIAG=m

CONFIG_INET_TCP_DIAG=m

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

CONFIG_IPV6=y

# CONFIG_IPV6_PRIVACY is not set

# CONFIG_INET6_AH is not set

# CONFIG_INET6_ESP is not set

# CONFIG_INET6_IPCOMP is not set

# CONFIG_INET6_TUNNEL is not set

CONFIG_INET6_AH=y

CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_INET6_TUNNEL=y

# CONFIG_IPV6_TUNNEL is not set

# CONFIG_NETFILTER is not set
@@ -207,7 +237,8 @@ CONFIG_IPV6=y 
# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set

# CONFIG_DECNET is not set

# CONFIG_LLC2 is not set

CONFIG_LLC=m

CONFIG_LLC2=m

# CONFIG_IPX is not set

# CONFIG_ATALK is not set

# CONFIG_X25 is not set
@@ -237,9 +268,9 @@ CONFIG_IPV6=y 
#

# Generic Driver Options

#

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

CONFIG_FW_LOADER=y

# CONFIG_DEBUG_DRIVER is not set



#
@@ -256,13 +287,14 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
# Parallel port support

#

CONFIG_PARPORT=y

CONFIG_PARPORT_PC=y

CONFIG_PARPORT_PC=m

# CONFIG_PARPORT_SERIAL is not set

# CONFIG_PARPORT_PC_FIFO is not set

# CONFIG_PARPORT_PC_SUPERIO is not set

CONFIG_PARPORT_PC_PCMCIA=m

CONFIG_PARPORT_NOT_PC=y

CONFIG_PARPORT_GSC=y

# CONFIG_PARPORT_1284 is not set

CONFIG_PARPORT_1284=y



#

# Plug and Play support
@@ -284,7 +316,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=y 
# CONFIG_BLK_DEV_UB is not set

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_SIZE=4096

CONFIG_BLK_DEV_RAM_SIZE=6144

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set
@@ -292,7 +324,60 @@ CONFIG_BLK_DEV_INITRD=y 
#

# ATA/ATAPI/MFM/RLL support

#

# CONFIG_IDE is not set

CONFIG_IDE=y

CONFIG_BLK_DEV_IDE=y



#

# Please see Documentation/ide.txt for help/info on IDE drives

#

# CONFIG_BLK_DEV_IDE_SATA is not set

CONFIG_BLK_DEV_IDEDISK=y

CONFIG_IDEDISK_MULTI_MODE=y

CONFIG_BLK_DEV_IDECS=y

CONFIG_BLK_DEV_IDECD=y

# CONFIG_BLK_DEV_IDETAPE is not set

# CONFIG_BLK_DEV_IDEFLOPPY is not set

CONFIG_BLK_DEV_IDESCSI=y

# CONFIG_IDE_TASK_IOCTL is not set



#

# IDE chipset support/bugfixes

#

CONFIG_IDE_GENERIC=y

CONFIG_BLK_DEV_IDEPCI=y

CONFIG_IDEPCI_SHARE_IRQ=y

# CONFIG_BLK_DEV_OFFBOARD is not set

CONFIG_BLK_DEV_GENERIC=y

# CONFIG_BLK_DEV_OPTI621 is not set

CONFIG_BLK_DEV_IDEDMA_PCI=y

# CONFIG_BLK_DEV_IDEDMA_FORCED is not set

# CONFIG_IDEDMA_PCI_AUTO is not set

# CONFIG_BLK_DEV_AEC62XX is not set

# CONFIG_BLK_DEV_ALI15X3 is not set

# CONFIG_BLK_DEV_AMD74XX is not set

# CONFIG_BLK_DEV_CMD64X is not set

# CONFIG_BLK_DEV_TRIFLEX is not set

# CONFIG_BLK_DEV_CY82C693 is not set

# CONFIG_BLK_DEV_CS5520 is not set

# CONFIG_BLK_DEV_CS5530 is not set

# CONFIG_BLK_DEV_HPT34X is not set

# CONFIG_BLK_DEV_HPT366 is not set

# CONFIG_BLK_DEV_SC1200 is not set

# CONFIG_BLK_DEV_PIIX is not set

# CONFIG_BLK_DEV_IT821X is not set

CONFIG_BLK_DEV_NS87415=y

# CONFIG_BLK_DEV_PDC202XX_OLD is not set

# CONFIG_BLK_DEV_PDC202XX_NEW is not set

# CONFIG_BLK_DEV_SVWKS is not set

# CONFIG_BLK_DEV_SIIMAGE is not set

# CONFIG_BLK_DEV_SLC90E66 is not set

# CONFIG_BLK_DEV_TRM290 is not set

# CONFIG_BLK_DEV_VIA82CXXX is not set

# CONFIG_IDE_ARM is not set

CONFIG_BLK_DEV_IDEDMA=y

# CONFIG_IDEDMA_IVB is not set

# CONFIG_IDEDMA_AUTO is not set

# CONFIG_BLK_DEV_HD is not set



#

# SCSI device support
@@ -374,6 +459,15 @@ CONFIG_SCSI_NCR53C8XX_SYNC=20 
# CONFIG_SCSI_NSP32 is not set

# CONFIG_SCSI_DEBUG is not set



#

# PCMCIA SCSI adapter support

#

# CONFIG_PCMCIA_AHA152X is not set

# CONFIG_PCMCIA_FDOMAIN is not set

# CONFIG_PCMCIA_NINJA_SCSI is not set

# CONFIG_PCMCIA_QLOGIC is not set

# CONFIG_PCMCIA_SYM53C500 is not set



#

# Multi-device support (RAID and LVM)

#
@@ -382,12 +476,17 @@ CONFIG_BLK_DEV_MD=y 
CONFIG_MD_LINEAR=y

CONFIG_MD_RAID0=y

CONFIG_MD_RAID1=y

# CONFIG_MD_RAID10 is not set

CONFIG_MD_RAID10=y

CONFIG_MD_RAID5=y

# CONFIG_MD_RAID6 is not set

CONFIG_MD_RAID6=y

# CONFIG_MD_MULTIPATH is not set

# CONFIG_MD_FAULTY is not set

# CONFIG_BLK_DEV_DM is not set

CONFIG_BLK_DEV_DM=y

# CONFIG_DM_CRYPT is not set

# CONFIG_DM_SNAPSHOT is not set

# CONFIG_DM_MIRROR is not set

# CONFIG_DM_ZERO is not set

# CONFIG_DM_MULTIPATH is not set



#

# Fusion MPT device support
@@ -411,10 +510,10 @@ CONFIG_MD_RAID5=y 
# Network device support

#

CONFIG_NETDEVICES=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

CONFIG_DUMMY=m

CONFIG_BONDING=m

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

CONFIG_TUN=m



#

# ARCnet devices
@@ -430,7 +529,7 @@ CONFIG_NETDEVICES=y 
# Ethernet (10 or 100Mbit)

#

CONFIG_NET_ETHERNET=y

# CONFIG_MII is not set

CONFIG_MII=m

CONFIG_LASI_82596=y

# CONFIG_HAPPYMEAL is not set

# CONFIG_SUNGEM is not set
@@ -451,6 +550,8 @@ CONFIG_TULIP=y 
# CONFIG_WINBOND_840 is not set

# CONFIG_DM9102 is not set

# CONFIG_ULI526X is not set

# CONFIG_PCMCIA_XIRCOM is not set

# CONFIG_PCMCIA_XIRTULIP is not set

# CONFIG_DEPCA is not set

# CONFIG_HP100 is not set

CONFIG_NET_PCI=y
@@ -518,13 +619,32 @@ CONFIG_NET_RADIO=y 
# Obsolete Wireless cards support (pre-802.11)

#

# CONFIG_STRIP is not set

# CONFIG_PCMCIA_WAVELAN is not set

# CONFIG_PCMCIA_NETWAVE is not set



#

# Wireless 802.11 Frequency Hopping cards support

#

# CONFIG_PCMCIA_RAYCS is not set



#

# Wireless 802.11b ISA/PCI cards support

#

# CONFIG_HERMES is not set

CONFIG_HERMES=y

# CONFIG_PLX_HERMES is not set

# CONFIG_TMD_HERMES is not set

# CONFIG_NORTEL_HERMES is not set

# CONFIG_PCI_HERMES is not set

# CONFIG_ATMEL is not set



#

# Wireless 802.11b Pcmcia/Cardbus cards support

#

CONFIG_PCMCIA_HERMES=y

CONFIG_PCMCIA_SPECTRUM=y

# CONFIG_AIRO_CS is not set

# CONFIG_PCMCIA_WL3501 is not set



#

# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support

#
@@ -532,6 +652,19 @@ CONFIG_NET_RADIO=y 
# CONFIG_HOSTAP is not set

CONFIG_NET_WIRELESS=y



#

# PCMCIA network device support

#

CONFIG_NET_PCMCIA=y

# CONFIG_PCMCIA_3C589 is not set

# CONFIG_PCMCIA_3C574 is not set

# CONFIG_PCMCIA_FMVJ18X is not set

# CONFIG_PCMCIA_PCNET is not set

# CONFIG_PCMCIA_NMCLAN is not set

# CONFIG_PCMCIA_SMC91C92 is not set

# CONFIG_PCMCIA_XIRC2PS is not set

# CONFIG_PCMCIA_AXNET is not set



#

# Wan interfaces

#
@@ -539,7 +672,15 @@ CONFIG_NET_WIRELESS=y 
# CONFIG_FDDI is not set

# CONFIG_HIPPI is not set

# CONFIG_PLIP is not set

# CONFIG_PPP is not set

CONFIG_PPP=m

# CONFIG_PPP_MULTILINK is not set

# CONFIG_PPP_FILTER is not set

CONFIG_PPP_ASYNC=m

CONFIG_PPP_SYNC_TTY=m

CONFIG_PPP_DEFLATE=m

CONFIG_PPP_BSDCOMP=m

# CONFIG_PPP_MPPE is not set

CONFIG_PPPOE=m

# CONFIG_SLIP is not set

# CONFIG_NET_FC is not set

# CONFIG_SHAPER is not set
@@ -571,14 +712,16 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

# CONFIG_INPUT_JOYDEV is not set

# CONFIG_INPUT_TSDEV is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_EVDEV is not set

# CONFIG_INPUT_EVBUG is not set



#

# Input Device Drivers

#

CONFIG_INPUT_KEYBOARD=y

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_ATKBD=y

CONFIG_KEYBOARD_ATKBD_HP_KEYCODES=y

# CONFIG_KEYBOARD_ATKBD_RDI_KEYCODES is not set

# CONFIG_KEYBOARD_SUNKBD is not set

# CONFIG_KEYBOARD_LKKBD is not set

# CONFIG_KEYBOARD_XTKBD is not set
@@ -586,52 +729,25 @@ CONFIG_INPUT_KEYBOARD=y 
# CONFIG_KEYBOARD_HIL_OLD is not set

CONFIG_KEYBOARD_HIL=y

CONFIG_INPUT_MOUSE=y

# CONFIG_MOUSE_PS2 is not set

# CONFIG_MOUSE_SERIAL is not set

CONFIG_MOUSE_PS2=y

CONFIG_MOUSE_SERIAL=y

# CONFIG_MOUSE_VSXXXAA is not set

CONFIG_MOUSE_HIL=y

CONFIG_INPUT_JOYSTICK=y

# CONFIG_JOYSTICK_ANALOG is not set

# CONFIG_JOYSTICK_A3D is not set

# CONFIG_JOYSTICK_ADI is not set

# CONFIG_JOYSTICK_COBRA is not set

# CONFIG_JOYSTICK_GF2K is not set

# CONFIG_JOYSTICK_GRIP is not set

# CONFIG_JOYSTICK_GRIP_MP is not set

# CONFIG_JOYSTICK_GUILLEMOT is not set

# CONFIG_JOYSTICK_INTERACT is not set

# CONFIG_JOYSTICK_SIDEWINDER is not set

# CONFIG_JOYSTICK_TMDC is not set

# CONFIG_JOYSTICK_IFORCE is not set

# CONFIG_JOYSTICK_WARRIOR is not set

# CONFIG_JOYSTICK_MAGELLAN is not set

# CONFIG_JOYSTICK_SPACEORB is not set

# CONFIG_JOYSTICK_SPACEBALL is not set

# CONFIG_JOYSTICK_STINGER is not set

# CONFIG_JOYSTICK_TWIDJOY is not set

# CONFIG_JOYSTICK_DB9 is not set

# CONFIG_JOYSTICK_GAMECON is not set

# CONFIG_JOYSTICK_TURBOGRAFX is not set

# CONFIG_JOYSTICK_JOYDUMP is not set

CONFIG_INPUT_TOUCHSCREEN=y

# CONFIG_TOUCHSCREEN_GUNZE is not set

# CONFIG_TOUCHSCREEN_ELO is not set

# CONFIG_TOUCHSCREEN_MTOUCH is not set

# CONFIG_TOUCHSCREEN_MK712 is not set

CONFIG_INPUT_MISC=y

# CONFIG_INPUT_UINPUT is not set

CONFIG_HP_SDC_RTC=y

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TOUCHSCREEN is not set

# CONFIG_INPUT_MISC is not set



#

# Hardware I/O ports

#

CONFIG_SERIO=y

# CONFIG_SERIO_SERPORT is not set

CONFIG_SERIO_SERPORT=y

# CONFIG_SERIO_PARKBD is not set

CONFIG_SERIO_GSCPS2=y

CONFIG_HP_SDC=y

CONFIG_HIL_MLC=y

# CONFIG_SERIO_PCIPS2 is not set

CONFIG_SERIO_LIBPS2=y

# CONFIG_SERIO_RAW is not set

# CONFIG_GAMEPORT is not set
@@ -648,7 +764,8 @@ CONFIG_HW_CONSOLE=y 
#

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=13

CONFIG_SERIAL_8250_CS=y

CONFIG_SERIAL_8250_NR_UARTS=17

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y
@@ -666,10 +783,10 @@ CONFIG_SERIAL_CORE_CONSOLE=y 
# CONFIG_SERIAL_JSM is not set

CONFIG_UNIX98_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256

CONFIG_PRINTER=y

CONFIG_LEGACY_PTY_COUNT=64

CONFIG_PRINTER=m

# CONFIG_LP_CONSOLE is not set

# CONFIG_PPDEV is not set

CONFIG_PPDEV=m

# CONFIG_TIPAR is not set



#
@@ -682,7 +799,7 @@ CONFIG_PRINTER=y 
#

# CONFIG_WATCHDOG is not set

CONFIG_GEN_RTC=y

# CONFIG_GEN_RTC_X is not set

CONFIG_GEN_RTC_X=y

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set
@@ -691,6 +808,13 @@ CONFIG_GEN_RTC=y 
# Ftape, the floppy tape device driver

#

# CONFIG_DRM is not set



#

# PCMCIA character devices

#

# CONFIG_SYNCLINK_CS is not set

# CONFIG_CARDMAN_4000 is not set

# CONFIG_CARDMAN_4040 is not set

# CONFIG_RAW_DRIVER is not set



#
@@ -718,10 +842,8 @@ CONFIG_GEN_RTC=y 
#

# Hardware Monitoring support

#

CONFIG_HWMON=y

# CONFIG_HWMON is not set

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#

# Misc devices
@@ -749,8 +871,8 @@ CONFIG_FB_CFB_FILLRECT=y 
CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

# CONFIG_FB_MACMODES is not set

# CONFIG_FB_MODE_HELPERS is not set

# CONFIG_FB_TILEBLITTING is not set

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y

# CONFIG_FB_CIRRUS is not set

# CONFIG_FB_PM2 is not set

# CONFIG_FB_CYBER2000 is not set
@@ -778,8 +900,8 @@ CONFIG_FB_STI=y 
# Console display driver support

#

CONFIG_DUMMY_CONSOLE=y

CONFIG_DUMMY_CONSOLE_COLUMNS=160

CONFIG_DUMMY_CONSOLE_ROWS=64

CONFIG_DUMMY_CONSOLE_COLUMNS=128

CONFIG_DUMMY_CONSOLE_ROWS=48

CONFIG_FRAMEBUFFER_CONSOLE=y

# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set

CONFIG_STI_CONSOLE=y
@@ -816,13 +938,14 @@ CONFIG_SOUND=y 
CONFIG_SND=y

CONFIG_SND_TIMER=y

CONFIG_SND_PCM=y

CONFIG_SND_HWDEP=y

CONFIG_SND_SEQUENCER=y

# CONFIG_SND_SEQ_DUMMY is not set

CONFIG_SND_OSSEMUL=y

CONFIG_SND_MIXER_OSS=y

CONFIG_SND_PCM_OSS=y

CONFIG_SND_SEQUENCER_OSS=y

# CONFIG_SND_DYNAMIC_MINORS is not set

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_SUPPORT_OLD_API=y

# CONFIG_SND_VERBOSE_PRINTK is not set

# CONFIG_SND_DEBUG is not set
@@ -830,6 +953,7 @@ CONFIG_SND_SUPPORT_OLD_API=y 
#

# Generic devices

#

CONFIG_SND_OPL3_LIB=y

CONFIG_SND_AC97_CODEC=y

CONFIG_SND_AC97_BUS=y

# CONFIG_SND_DUMMY is not set
@@ -842,7 +966,7 @@ CONFIG_SND_AC97_BUS=y 
# PCI devices

#

CONFIG_SND_AD1889=y

# CONFIG_SND_AD1889_OPL3 is not set

CONFIG_SND_AD1889_OPL3=y

# CONFIG_SND_ALI5451 is not set

# CONFIG_SND_ATIIXP is not set

# CONFIG_SND_ATIIXP_MODEM is not set
@@ -889,6 +1013,10 @@ CONFIG_SND_AD1889=y 
#

# CONFIG_SND_USB_AUDIO is not set



#

# PCMCIA devices

#



#

# GSC devices

#
@@ -905,12 +1033,12 @@ CONFIG_SND_HARMONY=y 
CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB=y

CONFIG_USB_DEBUG=y

# CONFIG_USB_DEBUG is not set



#

# Miscellaneous USB options

#

# CONFIG_USB_DEVICEFS is not set

CONFIG_USB_DEVICEFS=y

# CONFIG_USB_BANDWIDTH is not set

# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_OTG is not set
@@ -918,14 +1046,12 @@ CONFIG_USB_DEBUG=y 
#

# USB Host Controller Drivers

#

CONFIG_USB_EHCI_HCD=y

# CONFIG_USB_EHCI_SPLIT_ISO is not set

# CONFIG_USB_EHCI_ROOT_HUB_TT is not set

# CONFIG_USB_EHCI_HCD is not set

# CONFIG_USB_ISP116X_HCD is not set

CONFIG_USB_OHCI_HCD=y

# CONFIG_USB_OHCI_BIG_ENDIAN is not set

CONFIG_USB_OHCI_LITTLE_ENDIAN=y

# CONFIG_USB_UHCI_HCD is not set

CONFIG_USB_UHCI_HCD=y

# CONFIG_USB_SL811_HCD is not set



#
@@ -948,13 +1074,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y 
#

# USB Input Devices

#

# CONFIG_USB_HID is not set



#

# USB HID Boot Protocol drivers

#

# CONFIG_USB_KBD is not set

# CONFIG_USB_MOUSE is not set

CONFIG_USB_HID=y

CONFIG_USB_HIDINPUT=y

# CONFIG_USB_HIDINPUT_POWERBOOK is not set

# CONFIG_HID_FF is not set

# CONFIG_USB_HIDDEV is not set

# CONFIG_USB_AIPTEK is not set

# CONFIG_USB_WACOM is not set

# CONFIG_USB_ACECAD is not set
@@ -1020,8 +1144,8 @@ CONFIG_USB_MON=y 
# CONFIG_USB_PHIDGETKIT is not set

# CONFIG_USB_PHIDGETSERVO is not set

# CONFIG_USB_IDMOUSE is not set

# CONFIG_USB_SISUSBVGA is not set

# CONFIG_USB_LD is not set

# CONFIG_USB_TEST is not set



#

# USB DSL modem support
@@ -1058,7 +1182,7 @@ CONFIG_JBD=y 
# CONFIG_JBD_DEBUG is not set

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set

CONFIG_FS_POSIX_ACL=y

# CONFIG_XFS_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set
@@ -1066,7 +1190,7 @@ CONFIG_JBD=y 
CONFIG_INOTIFY=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set

CONFIG_AUTOFS_FS=y

# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set
@@ -1081,8 +1205,11 @@ CONFIG_JOLIET=y 
#

# DOS/FAT/NT Filesystems

#

CONFIG_FAT_FS=y

# CONFIG_MSDOS_FS is not set

# CONFIG_VFAT_FS is not set

CONFIG_VFAT_FS=y

CONFIG_FAT_DEFAULT_CODEPAGE=437

CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"

# CONFIG_NTFS_FS is not set



#
@@ -1125,7 +1252,7 @@ CONFIG_NFS_V3=y 
CONFIG_NFSD=y

CONFIG_NFSD_V3=y

# CONFIG_NFSD_V3_ACL is not set

# CONFIG_NFSD_V4 is not set

CONFIG_NFSD_V4=y

CONFIG_NFSD_TCP=y

CONFIG_ROOT_NFS=y

CONFIG_LOCKD=y
@@ -1133,10 +1260,16 @@ CONFIG_LOCKD_V4=y 
CONFIG_EXPORTFS=y

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

# CONFIG_RPCSEC_GSS_KRB5 is not set

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CIFS is not set

CONFIG_SUNRPC_GSS=y

CONFIG_RPCSEC_GSS_KRB5=y

CONFIG_RPCSEC_GSS_SPKM3=m

CONFIG_SMB_FS=m

CONFIG_SMB_NLS_DEFAULT=y

CONFIG_SMB_NLS_REMOTE="cp437"

CONFIG_CIFS=m

# CONFIG_CIFS_STATS is not set

# CONFIG_CIFS_XATTR is not set

# CONFIG_CIFS_EXPERIMENTAL is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set
@@ -1153,50 +1286,50 @@ CONFIG_MSDOS_PARTITION=y 
#

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="iso8859-1"

# CONFIG_NLS_CODEPAGE_437 is not set

# CONFIG_NLS_CODEPAGE_737 is not set

# CONFIG_NLS_CODEPAGE_775 is not set

# CONFIG_NLS_CODEPAGE_850 is not set

# CONFIG_NLS_CODEPAGE_852 is not set

# CONFIG_NLS_CODEPAGE_855 is not set

# CONFIG_NLS_CODEPAGE_857 is not set

# CONFIG_NLS_CODEPAGE_860 is not set

# CONFIG_NLS_CODEPAGE_861 is not set

# CONFIG_NLS_CODEPAGE_862 is not set

# CONFIG_NLS_CODEPAGE_863 is not set

# CONFIG_NLS_CODEPAGE_864 is not set

# CONFIG_NLS_CODEPAGE_865 is not set

# CONFIG_NLS_CODEPAGE_866 is not set

# CONFIG_NLS_CODEPAGE_869 is not set

# CONFIG_NLS_CODEPAGE_936 is not set

# CONFIG_NLS_CODEPAGE_950 is not set

# CONFIG_NLS_CODEPAGE_932 is not set

# CONFIG_NLS_CODEPAGE_949 is not set

# CONFIG_NLS_CODEPAGE_874 is not set

# CONFIG_NLS_ISO8859_8 is not set

# CONFIG_NLS_CODEPAGE_1250 is not set

# CONFIG_NLS_CODEPAGE_1251 is not set

# CONFIG_NLS_ASCII is not set

# CONFIG_NLS_ISO8859_1 is not set

# CONFIG_NLS_ISO8859_2 is not set

# CONFIG_NLS_ISO8859_3 is not set

# CONFIG_NLS_ISO8859_4 is not set

# CONFIG_NLS_ISO8859_5 is not set

# CONFIG_NLS_ISO8859_6 is not set

# CONFIG_NLS_ISO8859_7 is not set

# CONFIG_NLS_ISO8859_9 is not set

# CONFIG_NLS_ISO8859_13 is not set

# CONFIG_NLS_ISO8859_14 is not set

# CONFIG_NLS_ISO8859_15 is not set

# CONFIG_NLS_KOI8_R is not set

# CONFIG_NLS_KOI8_U is not set

# CONFIG_NLS_UTF8 is not set

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_737=m

CONFIG_NLS_CODEPAGE_775=m

CONFIG_NLS_CODEPAGE_850=m

CONFIG_NLS_CODEPAGE_852=m

CONFIG_NLS_CODEPAGE_855=m

CONFIG_NLS_CODEPAGE_857=m

CONFIG_NLS_CODEPAGE_860=m

CONFIG_NLS_CODEPAGE_861=m

CONFIG_NLS_CODEPAGE_862=m

CONFIG_NLS_CODEPAGE_863=m

CONFIG_NLS_CODEPAGE_864=m

CONFIG_NLS_CODEPAGE_865=m

CONFIG_NLS_CODEPAGE_866=m

CONFIG_NLS_CODEPAGE_869=m

CONFIG_NLS_CODEPAGE_936=m

CONFIG_NLS_CODEPAGE_950=m

CONFIG_NLS_CODEPAGE_932=m

CONFIG_NLS_CODEPAGE_949=m

CONFIG_NLS_CODEPAGE_874=m

CONFIG_NLS_ISO8859_8=m

CONFIG_NLS_CODEPAGE_1250=y

CONFIG_NLS_CODEPAGE_1251=m

CONFIG_NLS_ASCII=m

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_2=m

CONFIG_NLS_ISO8859_3=m

CONFIG_NLS_ISO8859_4=m

CONFIG_NLS_ISO8859_5=m

CONFIG_NLS_ISO8859_6=m

CONFIG_NLS_ISO8859_7=m

CONFIG_NLS_ISO8859_9=m

CONFIG_NLS_ISO8859_13=m

CONFIG_NLS_ISO8859_14=m

CONFIG_NLS_ISO8859_15=m

CONFIG_NLS_KOI8_R=m

CONFIG_NLS_KOI8_U=m

CONFIG_NLS_UTF8=y



#

# Profiling support

#

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

CONFIG_OPROFILE=m



#

# Kernel hacking
@@ -1204,7 +1337,7 @@ CONFIG_OPROFILE=y 
# CONFIG_PRINTK_TIME is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=15

CONFIG_LOG_BUF_SHIFT=16

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set
@@ -1217,42 +1350,43 @@ CONFIG_DEBUG_MUTEXES=y 
# CONFIG_DEBUG_VM is not set

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

CONFIG_DEBUG_RODATA=y

# CONFIG_DEBUG_RODATA is not set



#

# Security options

#

# CONFIG_KEYS is not set

CONFIG_KEYS=y

CONFIG_KEYS_DEBUG_PROC_KEYS=y

# CONFIG_SECURITY is not set



#

# Cryptographic options

#

CONFIG_CRYPTO=y

# CONFIG_CRYPTO_HMAC is not set

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_MD4 is not set

# CONFIG_CRYPTO_MD5 is not set

# CONFIG_CRYPTO_SHA1 is not set

# CONFIG_CRYPTO_SHA256 is not set

# CONFIG_CRYPTO_SHA512 is not set

# CONFIG_CRYPTO_WP512 is not set

# CONFIG_CRYPTO_TGR192 is not set

# CONFIG_CRYPTO_DES is not set

# CONFIG_CRYPTO_BLOWFISH is not set

# CONFIG_CRYPTO_TWOFISH is not set

# CONFIG_CRYPTO_SERPENT is not set

# CONFIG_CRYPTO_AES is not set

# CONFIG_CRYPTO_CAST5 is not set

# CONFIG_CRYPTO_CAST6 is not set

# CONFIG_CRYPTO_TEA is not set

# CONFIG_CRYPTO_ARC4 is not set

# CONFIG_CRYPTO_KHAZAD is not set

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_TEST is not set

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_SHA1=y

CONFIG_CRYPTO_SHA256=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_DES=y

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_AES=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_DEFLATE=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_CRC32C=m

CONFIG_CRYPTO_TEST=m



#

# Hardware crypto devices
@@ -1261,7 +1395,9 @@ CONFIG_CRYPTO=y 
#

# Library routines

#

# CONFIG_CRC_CCITT is not set

CONFIG_CRC_CCITT=m

# CONFIG_CRC16 is not set

CONFIG_CRC32=y

# CONFIG_LIBCRC32C is not set
 
CONFIG_LIBCRC32C=m

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

arch/parisc/kernel/asm-offsets.c

+3 −0
Original line number Diff line number Diff line
@@ -288,8 +288,11 @@ int main(void) 
	DEFINE(ASM_PGD_ENTRY_SIZE, PGD_ENTRY_SIZE);

	DEFINE(ASM_PMD_ENTRY_SIZE, PMD_ENTRY_SIZE);

	DEFINE(ASM_PTE_ENTRY_SIZE, PTE_ENTRY_SIZE);

	DEFINE(ASM_PFN_PTE_SHIFT, PFN_PTE_SHIFT);

	DEFINE(ASM_PT_INITIAL, PT_INITIAL);

	DEFINE(ASM_PAGE_SIZE, PAGE_SIZE);

	DEFINE(ASM_PAGE_SIZE_DIV64, PAGE_SIZE/64);

	DEFINE(ASM_PAGE_SIZE_DIV128, PAGE_SIZE/128);

	BLANK();

	DEFINE(EXCDATA_IP, offsetof(struct exception_data, fault_ip));

	DEFINE(EXCDATA_SPACE, offsetof(struct exception_data, fault_space));

arch/parisc/kernel/cache.c

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 1999 Helge Deller (07-13-1999)

 * Copyright (C) 1999-2006 Helge Deller <deller@gmx.de> (07-13-1999)

 * Copyright (C) 1999 SuSE GmbH Nuernberg

 * Copyright (C) 2000 Philipp Rumpf (prumpf@tux.org)

 *
@@ -358,5 +358,5 @@ void parisc_setup_cache_timing(void) 
	if (!parisc_cache_flush_threshold)

		parisc_cache_flush_threshold = FLUSH_THRESHOLD;



	printk("Setting cache flush threshold to %x (%d CPUs online)\n", parisc_cache_flush_threshold, num_online_cpus());

	printk(KERN_INFO "Setting cache flush threshold to %x (%d CPUs online)\n", parisc_cache_flush_threshold, num_online_cpus());

}