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

Commit 8aa9c367 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parsic updates from Helge Deller:
 - a fix for the mmap(MAP_FIXED|MAP_SHARED) syscall to the same address
   which was already given in a previous call (fixes locale-gen on
   debian)
 - change the memory layout of the kernel to avoid the need for the
   -mlong-calls compiler option (depends on commit 5ecbe3c3 -
   "kernel/extable: fix address-checks for core_kernel and init areas")
 - defconfig updates, e.g.  use the SIL680 driver instead of the SIIMAGE
   driver
 - add more parisc machine names to the machine database

* 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: update 64bit defconfigs and use SIL680 instead of SIIMAGE driver
  parisc: remove CONFIG_MLONGCALLS=y from defconfigs
  parisc: fix kernel memory layout in vmlinux.ld.S
  parisc: use kernel_text_address() in unwind functions
  parisc: remove empty SERIAL_PORT_DFNS in serial.h
  parisc: add some more machine names to hardware database
  parisc: fix mmap(MAP_FIXED|MAP_SHARED) to already mmapped address
parents 27871790 a16ab68e

arch/parisc/configs/c3000_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_IDE=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_NS87415=y

CONFIG_BLK_DEV_SIIMAGE=m

CONFIG_PATA_SIL680=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=y

arch/parisc/configs/c8000_defconfig

+3 −33
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_MODVERSIONS=y

CONFIG_BLK_DEV_INTEGRITY=y

CONFIG_PA8X00=y

CONFIG_MLONGCALLS=y

CONFIG_64BIT=y

CONFIG_SMP=y

CONFIG_PREEMPT=y
@@ -81,8 +80,6 @@ CONFIG_IDE=y 
CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_PLATFORM=y

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_SIIMAGE=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=m

CONFIG_BLK_DEV_SR=m
@@ -94,6 +91,8 @@ CONFIG_SCSI_FC_ATTRS=y 
CONFIG_SCSI_SAS_LIBSAS=m

CONFIG_ISCSI_TCP=m

CONFIG_ISCSI_BOOT_SYSFS=m

CONFIG_ATA=y

CONFIG_PATA_SIL680=y

CONFIG_FUSION=y

CONFIG_FUSION_SPI=y

CONFIG_FUSION_SAS=y
@@ -114,9 +113,8 @@ CONFIG_INPUT_FF_MEMLESS=m 
# CONFIG_KEYBOARD_ATKBD is not set

# CONFIG_KEYBOARD_HIL_OLD is not set

# CONFIG_KEYBOARD_HIL is not set

CONFIG_MOUSE_PS2=m

# CONFIG_MOUSE_PS2 is not set

CONFIG_INPUT_MISC=y

CONFIG_INPUT_CM109=m

CONFIG_SERIO_SERPORT=m

CONFIG_SERIO_PARKBD=m

CONFIG_SERIO_GSCPS2=m
@@ -167,34 +165,6 @@ CONFIG_SND_VERBOSE_PRINTK=y 
CONFIG_SND_AD1889=m

# CONFIG_SND_USB is not set

# CONFIG_SND_GSC is not set

CONFIG_HID_A4TECH=m

CONFIG_HID_APPLE=m

CONFIG_HID_BELKIN=m

CONFIG_HID_CHERRY=m

CONFIG_HID_CHICONY=m

CONFIG_HID_CYPRESS=m

CONFIG_HID_DRAGONRISE=m

CONFIG_HID_EZKEY=m

CONFIG_HID_KYE=m

CONFIG_HID_GYRATION=m

CONFIG_HID_TWINHAN=m

CONFIG_HID_KENSINGTON=m

CONFIG_HID_LOGITECH=m

CONFIG_HID_LOGITECH_DJ=m

CONFIG_HID_MICROSOFT=m

CONFIG_HID_MONTEREY=m

CONFIG_HID_NTRIG=m

CONFIG_HID_ORTEK=m

CONFIG_HID_PANTHERLORD=m

CONFIG_HID_PETALYNX=m

CONFIG_HID_SAMSUNG=m

CONFIG_HID_SUNPLUS=m

CONFIG_HID_GREENASIA=m

CONFIG_HID_SMARTJOYPLUS=m

CONFIG_HID_TOPSEED=m

CONFIG_HID_THRUSTMASTER=m

CONFIG_HID_ZEROPLUS=m

CONFIG_USB_HID=m

CONFIG_USB=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=y

arch/parisc/configs/generic-64bit_defconfig

+4 −35
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ CONFIG_MODVERSIONS=y 
CONFIG_BLK_DEV_INTEGRITY=y

# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_PA8X00=y

CONFIG_MLONGCALLS=y

CONFIG_64BIT=y

CONFIG_SMP=y

# CONFIG_COMPACTION is not set
@@ -68,7 +67,6 @@ CONFIG_IDE_GD=m 
CONFIG_IDE_GD_ATAPI=y

CONFIG_BLK_DEV_IDECD=m

CONFIG_BLK_DEV_NS87415=y

CONFIG_BLK_DEV_SIIMAGE=y

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=y
@@ -82,6 +80,7 @@ CONFIG_SCSI_ZALON=y 
CONFIG_SCSI_QLA_ISCSI=m

CONFIG_SCSI_DH=y

CONFIG_ATA=y

CONFIG_PATA_SIL680=y

CONFIG_ATA_GENERIC=y

CONFIG_MD=y

CONFIG_MD_LINEAR=m
@@ -162,7 +161,7 @@ CONFIG_SLIP_MODE_SLIP6=y 
CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_HIL_OLD is not set

# CONFIG_KEYBOARD_HIL is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_MOUSE_PS2 is not set

CONFIG_INPUT_MISC=y

CONFIG_SERIO_SERPORT=m

# CONFIG_HP_SDC is not set
@@ -216,32 +215,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y 
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

CONFIG_HID=m

CONFIG_HIDRAW=y

CONFIG_HID_DRAGONRISE=m

CONFIG_DRAGONRISE_FF=y

CONFIG_HID_KYE=m

CONFIG_HID_GYRATION=m

CONFIG_HID_TWINHAN=m

CONFIG_LOGITECH_FF=y

CONFIG_LOGIRUMBLEPAD2_FF=y

CONFIG_HID_NTRIG=m

CONFIG_HID_PANTHERLORD=m

CONFIG_PANTHERLORD_FF=y

CONFIG_HID_PETALYNX=m

CONFIG_HID_SAMSUNG=m

CONFIG_HID_SONY=m

CONFIG_HID_SUNPLUS=m

CONFIG_HID_GREENASIA=m

CONFIG_GREENASIA_FF=y

CONFIG_HID_SMARTJOYPLUS=m

CONFIG_SMARTJOYPLUS_FF=y

CONFIG_HID_TOPSEED=m

CONFIG_HID_THRUSTMASTER=m

CONFIG_THRUSTMASTER_FF=y

CONFIG_HID_ZEROPLUS=m

CONFIG_ZEROPLUS_FF=y

CONFIG_USB_HID=m

CONFIG_HID_PID=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y
@@ -251,13 +225,8 @@ CONFIG_USB_DYNAMIC_MINORS=y 
CONFIG_USB_MON=m

CONFIG_USB_WUSB_CBAF=m

CONFIG_USB_XHCI_HCD=m

CONFIG_USB_EHCI_HCD=m

CONFIG_USB_OHCI_HCD=m

CONFIG_USB_R8A66597_HCD=m

CONFIG_USB_ACM=m

CONFIG_USB_PRINTER=m

CONFIG_USB_WDM=m

CONFIG_USB_TMC=m

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_OHCI_HCD=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_TRIGGERS=y

arch/parisc/include/asm/serial.h

+0 −2
Original line number Diff line number Diff line
@@ -6,5 +6,3 @@ 
 * This is used for 16550-compatible UARTs

 */

#define BASE_BAUD ( 1843200 / 16 )
 


#define SERIAL_PORT_DFNS

arch/parisc/kernel/hardware.c

+6 −1
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ 
 *	HP PARISC Hardware Database

 *	Access to this database is only possible during bootup

 *	so don't reference this table after starting the init process

 *

 *	NOTE: Product names which are listed here and ends with a '?'

 *	are guessed. If you know the correct name, please let us know.

 */

 

static struct hp_hardware hp_hardware_list[] = {
@@ -222,7 +225,7 @@ static struct hp_hardware hp_hardware_list[] = { 
	{HPHW_NPROC,0x5DD,0x4,0x81,"Duet W2"},

	{HPHW_NPROC,0x5DE,0x4,0x81,"Piccolo W+"},

	{HPHW_NPROC,0x5DF,0x4,0x81,"Cantata W2"},

	{HPHW_NPROC,0x5DF,0x0,0x00,"Marcato W+? (rp5470)"},

	{HPHW_NPROC,0x5DF,0x0,0x00,"Marcato W+ (rp5470)?"},

	{HPHW_NPROC,0x5E0,0x4,0x91,"Cantata DC- W2"},

	{HPHW_NPROC,0x5E1,0x4,0x91,"Crescendo DC- W2"},

	{HPHW_NPROC,0x5E2,0x4,0x91,"Crescendo 650 W2"},
@@ -276,9 +279,11 @@ static struct hp_hardware hp_hardware_list[] = { 
	{HPHW_NPROC,0x888,0x4,0x91,"Storm Peak Fast DC-"},

	{HPHW_NPROC,0x889,0x4,0x91,"Storm Peak Fast"},

	{HPHW_NPROC,0x88A,0x4,0x91,"Crestone Peak Slow"},

	{HPHW_NPROC,0x88B,0x4,0x91,"Crestone Peak Fast?"},

	{HPHW_NPROC,0x88C,0x4,0x91,"Orca Mako+"},

	{HPHW_NPROC,0x88D,0x4,0x91,"Rainier/Medel Mako+ Slow"},

	{HPHW_NPROC,0x88E,0x4,0x91,"Rainier/Medel Mako+ Fast"},

	{HPHW_NPROC,0x892,0x4,0x91,"Mt. Hamilton Slow Mako+?"},

	{HPHW_NPROC,0x894,0x4,0x91,"Mt. Hamilton Fast Mako+"},

	{HPHW_NPROC,0x895,0x4,0x91,"Storm Peak Slow Mako+"},

	{HPHW_NPROC,0x896,0x4,0x91,"Storm Peak Fast Mako+"},