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

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

arch/sparc64/defconfig

@@ -799,11 +799,9 @@ CONFIG_ATM_TCP=m
 # CONFIG_ATM_ENI is not set
 # CONFIG_ATM_FIRESTREAM is not set
 # CONFIG_ATM_ZATM is not set
-# CONFIG_ATM_NICSTAR is not set
 # CONFIG_ATM_IDT77252 is not set
 # CONFIG_ATM_AMBASSADOR is not set
 # CONFIG_ATM_HORIZON is not set
-# CONFIG_ATM_IA is not set
 CONFIG_ATM_FORE200E_MAYBE=m
 CONFIG_ATM_FORE200E_PCA=y
 CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y
@@ -835,7 +833,6 @@ CONFIG_ROSE=m
 # CONFIG_BAYCOM_SER_FDX is not set
 # CONFIG_BAYCOM_SER_HDX is not set
 # CONFIG_BAYCOM_PAR is not set
-# CONFIG_BAYCOM_EPP is not set
 # CONFIG_YAM is not set
 
 #
@@ -1037,7 +1034,6 @@ 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
@@ -1148,6 +1144,7 @@ CONFIG_UFS_FS_WRITE=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
+CONFIG_NFS_DIRECTIO=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V4=y
@@ -1273,7 +1270,7 @@ CONFIG_DVB_CORE=m
 # Supported Frontend Modules
 #
 CONFIG_DVB_STV0299=m
-CONFIG_DVB_ALPS_BSRV2=m
+CONFIG_DVB_SP887X=m
 CONFIG_DVB_ALPS_TDLB7=m
 CONFIG_DVB_ALPS_TDMB7=m
 CONFIG_DVB_ATMEL_AT76C651=m
@@ -1282,6 +1279,7 @@ CONFIG_DVB_GRUNDIG_29504_491=m
 CONFIG_DVB_GRUNDIG_29504_401=m
 CONFIG_DVB_MT312=m
 CONFIG_DVB_VES1820=m
+CONFIG_DVB_VES1X93=m
 
 #
 # Supported SAA7146 based PCI Adapters
@@ -1302,6 +1300,7 @@ CONFIG_DVB_BUDGET_PATCH=m
 #
 CONFIG_DVB_B2C2_SKYSTAR=m
 CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m

arch/sparc64/kernel/unaligned.c

@@ -73,6 +73,14 @@ static inline int decode_access_size(unsigned int insn)
 	else {
 		printk("Impossible unaligned trap. insn=%08x\n", insn);
 		die_if_kernel("Byte sized unaligned access?!?!", current_thread_info()->kregs);
+
+		/* GCC should never warn that control reaches the end
+		 * of this function without returning a value because
+		 * die_if_kernel() is marked with attribute 'noreturn'.
+		 * Alas, some versions do...
+		 */
+
+		return 0;
 	}
 }