Merge bk://ppc.bkbits.net/for-linus-ppc

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

arch/ppc/Kconfig

@@ -472,8 +472,7 @@ config SANDPOINT
 	bool "Motorola-Sandpoint"
 	help
 	  Select SANDPOINT if configuring for a Motorola Sandpoint X3
-	  or X3(b).
-	  X3 (any flavor).
+	  (any flavor).
 
 config ADIR
 	bool "SBS-Adirondack"
@@ -693,6 +692,11 @@ config CPU_FREQ
 
 	  If in doubt, say N.
 
+config CPU_FREQ_TABLE
+	bool
+	depends on CPU_FREQ
+	default y
+
 config CPU_FREQ_PROC_INTF
 	bool "/proc/cpufreq interface (DEPRECATED)"
 	depends on CPU_FREQ && PROC_FS

arch/ppc/kernel/setup.c

@@ -15,6 +15,7 @@
 #include <linux/bootmem.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
+#include <linux/cpu.h>
 
 #include <asm/residual.h>
 #include <asm/io.h>

arch/ppc/lib/string.S

@@ -78,6 +78,8 @@ _GLOBAL(strcpy)
 	bne	1b
 	blr
 
+/* This clears out any unused part of the destination buffer,
+   just as the libc version does.  -- paulus */
 _GLOBAL(strncpy)
 	cmpwi	0,r5,0
 	beqlr
@@ -88,6 +90,12 @@ _GLOBAL(strncpy)
 	cmpwi	0,r0,0
 	stbu	r0,1(r6)
 	bdnzf	2,1b		/* dec ctr, branch if ctr != 0 && !cr0.eq */
+	bnelr			/* if we didn't hit a null char, we're done */
+	mfctr	r5
+	cmpwi	0,r5,0		/* any space left in destination buffer? */
+	beqlr			/* we know r0 == 0 here */
+2:	stbu	r0,1(r6)	/* clear it out if so */
+	bdnz	2b
 	blr
 
 _GLOBAL(strcat)