Merge bk://kernel.bkbits.net/davem/sparc-2.5

into home.osdl.org:/home/torvalds/v2.5/linux

arch/sparc64/defconfig

@@ -45,7 +45,6 @@ CONFIG_BBC_I2C=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
-# CONFIG_HUGETLB_PAGE is not set
 CONFIG_SMP=y
 # CONFIG_PREEMPT is not set
 CONFIG_NR_CPUS=4
@@ -605,7 +604,7 @@ CONFIG_ATM_BR2684=m
 CONFIG_ATM_BR2684_IPFILTER=y
 CONFIG_VLAN_8021Q=m
 CONFIG_LLC=m
-CONFIG_LLC_UI=y
+CONFIG_LLC2=m
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_ATALK=m
@@ -787,8 +786,9 @@ CONFIG_PCI_HERMES=m
 CONFIG_NET_WIRELESS=y
 
 #
-# Token Ring devices (depends on LLC=y)
+# Token Ring devices
 #
+# CONFIG_TR is not set
 CONFIG_NET_FC=y
 # CONFIG_RCPCI is not set
 CONFIG_SHAPER=m
@@ -982,6 +982,7 @@ CONFIG_KEYBOARD_SUNKBD=y
 # CONFIG_KEYBOARD_NEWTON is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
 CONFIG_MOUSE_SERIAL=y
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
@@ -994,37 +995,48 @@ CONFIG_INPUT_SPARCSPKR=y
 # I2C support
 #
 CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=m
+
+#
+# I2C Algorithms
+#
 CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_PHILIPSPAR=m
-CONFIG_SCx200_ACB=m
 CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_CHARDEV=m
 
 #
-# I2C Hardware Sensors Mainboard support
+# I2C Hardware Bus support
 #
 CONFIG_I2C_ALI1535=m
 CONFIG_I2C_ALI15X3=m
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD8111=m
 CONFIG_I2C_I801=m
+CONFIG_I2C_I810=m
 CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PHILIPSPAR=m
 CONFIG_I2C_PIIX4=m
+CONFIG_I2C_PROSAVAGE=m
+CONFIG_I2C_SAVAGE4=m
+CONFIG_SCx200_ACB=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
 CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_VOODOO3=m
 
 #
 # I2C Hardware Sensors Chip support
 #
+CONFIG_I2C_SENSOR=m
 CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_EEPROM=m
 CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM85=m
 CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM85=m
 CONFIG_SENSORS_VIA686A=m
 CONFIG_SENSORS_W83781D=m
-CONFIG_I2C_SENSOR=m
 
 #
 # File systems
@@ -1077,11 +1089,14 @@ CONFIG_VFAT_FS=m
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
 # CONFIG_DEVFS_FS is not set
 CONFIG_DEVPTS_FS=y
 CONFIG_DEVPTS_FS_XATTR=y
 # CONFIG_DEVPTS_FS_SECURITY is not set
 # CONFIG_TMPFS is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
 
 #
@@ -1133,6 +1148,7 @@ CONFIG_NCP_FS=m
 # CONFIG_NCPFS_NLS is not set
 # CONFIG_NCPFS_EXTRAS is not set
 CONFIG_CODA_FS=m
+# CONFIG_CODA_FS_OLD_API is not set
 # CONFIG_INTERMEZZO_FS is not set
 CONFIG_AFS_FS=m
 CONFIG_RXRPC=m
@@ -1302,9 +1318,6 @@ CONFIG_SND_VIRMIDI=m
 #
 CONFIG_SND_ALI5451=m
 CONFIG_SND_AZT3328=m
-CONFIG_SND_CS46XX=m
-# CONFIG_SND_CS46XX_NEW_DSP is not set
-CONFIG_SND_CS4281=m
 CONFIG_SND_EMU10K1=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_NM256=m
@@ -1312,20 +1325,15 @@ CONFIG_SND_NM256=m
 # CONFIG_SND_RME96 is not set
 # CONFIG_SND_RME9652 is not set
 # CONFIG_SND_HDSP is not set
-CONFIG_SND_TRIDENT=m
 CONFIG_SND_YMFPCI=m
 CONFIG_SND_ALS4000=m
 CONFIG_SND_CMIPCI=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
 CONFIG_SND_MAESTRO3=m
 CONFIG_SND_FM801=m
 CONFIG_SND_ICE1712=m
 # CONFIG_SND_ICE1724 is not set
 CONFIG_SND_INTEL8X0=m
-CONFIG_SND_SONICVIBES=m
 # CONFIG_SND_VIA82XX is not set
 CONFIG_SND_VX222=m
 
@@ -1424,7 +1432,6 @@ CONFIG_USB_HPUSBSCSI=m
 #
 # USB Network adaptors
 #
-CONFIG_USB_AX8817X_STANDALONE=m
 CONFIG_USB_CATC=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m

arch/sparc64/kernel/module.c

@@ -243,6 +243,12 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
 				((v >> 2) & 0x3fffff);
 			break;
 
+		case R_SPARC_WDISP19:
+			v -= (Elf64_Addr) location;
+			*loc32 = (*loc32 & ~0x7ffff) |
+				((v >> 2) & 0x7ffff);
+			break;
+
 		case R_SPARC_LO10:
 			*loc32 = (*loc32 & ~0x3ff) | (v & 0x3ff);
 			break;