---

yaml --- r: 298595 b: refs/heads/master c: 3b3b0e4 h: refs/heads/master i: 298593: 922e2fa 298591: 2c228a2 v: v3
git-mirror · Apr 3, 2012 · 4c3e688 · 4c3e688
1 parent 3985a4d
commit 4c3e688
Show file tree

Hide file tree

Showing 179 changed files with 851 additions and 1,777 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ff8f932bce11fc89e435acb30263a06cb8bd084
+refs/heads/master: 3b3b0e4fc15efa507b902d90cea39e496a523c3b
diff --git a/trunk/Documentation/devicetree/bindings/regulator/anatop-regulator.txt b/trunk/Documentation/devicetree/bindings/regulator/anatop-regulator.txt
diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt
@@ -6,6 +6,14 @@ be removed from this file.
 
 ---------------------------
 
+What:	x86 floppy disable_hlt
+When:	2012
+Why:	ancient workaround of dubious utility clutters the
+	code used by everybody else.
+Who:	Len Brown <len.brown@intel.com>
+
+---------------------------
+
 What:	CONFIG_APM_CPU_IDLE, and its ability to call APM BIOS in idle
 When:	2012
 Why:	This optional sub-feature of APM is of dubious reliability,

diff --git a/trunk/Documentation/hwmon/k10temp b/trunk/Documentation/hwmon/k10temp
@@ -11,7 +11,7 @@ Supported chips:
   Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra)
 * AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)
 * AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)
-* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity"
+* AMD Family 15h processors: "Bulldozer"
 
   Prefix: 'k10temp'
   Addresses scanned: PCI space

diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -1251,6 +1251,7 @@ ATHEROS ATH5K WIRELESS DRIVER
 M:	Jiri Slaby <jirislaby@gmail.com>
 M:	Nick Kossifidis <mickflemm@gmail.com>
 M:	"Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
+M:	Bob Copeland <me@bobcopeland.com>
 L:	linux-wireless@vger.kernel.org
 L:	ath5k-devel@lists.ath5k.org
 W:	http://wireless.kernel.org/en/users/Drivers/ath5k
@@ -3556,13 +3557,17 @@ L:	linux-pm@vger.kernel.org
 S:	Supported
 F:	arch/x86/platform/mrst/pmu.*
 
-INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
-M:	Stanislav Yakovlev <stas.yakovlev@gmail.com>
+INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
 L:	linux-wireless@vger.kernel.org
-S:	Maintained
+S:	Orphan
 F:	Documentation/networking/README.ipw2100
+F:	drivers/net/wireless/ipw2x00/ipw2100.*
+
+INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
+L:	linux-wireless@vger.kernel.org
+S:	Orphan
 F:	Documentation/networking/README.ipw2200
-F:	drivers/net/wireless/ipw2x00/
+F:	drivers/net/wireless/ipw2x00/ipw2200.*
 
 INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
 M:	Joseph Cihula <joseph.cihula@intel.com>

diff --git a/trunk/arch/arm/kernel/bios32.c b/trunk/arch/arm/kernel/bios32.c
@@ -299,6 +299,7 @@ static inline int pdev_bad_for_parity(struct pci_dev *dev)
  */
 void pcibios_fixup_bus(struct pci_bus *bus)
 {
+	struct pci_sys_data *root = bus->sysdata;
 	struct pci_dev *dev;
 	u16 features = PCI_COMMAND_SERR | PCI_COMMAND_PARITY | PCI_COMMAND_FAST_BACK;
 

diff --git a/trunk/arch/arm/kernel/insn.c b/trunk/arch/arm/kernel/insn.c
@@ -1,4 +1,3 @@
-#include <linux/bug.h>
 #include <linux/kernel.h>
 #include <asm/opcodes.h>
 

diff --git a/trunk/arch/arm/kernel/ptrace.c b/trunk/arch/arm/kernel/ptrace.c
@@ -256,7 +256,7 @@ static int ptrace_read_user(struct task_struct *tsk, unsigned long off,
 {
 	unsigned long tmp;
 
-	if (off & 3)
+	if (off & 3 || off >= sizeof(struct user))
 		return -EIO;
 
 	tmp = 0;
@@ -268,8 +268,6 @@ static int ptrace_read_user(struct task_struct *tsk, unsigned long off,
 		tmp = tsk->mm->end_code;
 	else if (off < sizeof(struct pt_regs))
 		tmp = get_user_reg(tsk, off >> 2);
-	else if (off >= sizeof(struct user))
-		return -EIO;
 
 	return put_user(tmp, ret);
 }

diff --git a/trunk/arch/arm/mach-omap2/include/mach/barriers.h b/trunk/arch/arm/mach-omap2/include/mach/barriers.h
@@ -22,8 +22,6 @@
 #ifndef __MACH_BARRIERS_H
 #define __MACH_BARRIERS_H
 
-#include <asm/outercache.h>
-
 extern void omap_bus_sync(void);
 
 #define rmb()		dsb()

diff --git a/trunk/arch/avr32/include/asm/barrier.h b/trunk/arch/avr32/include/asm/barrier.h
@@ -8,8 +8,6 @@
 #ifndef __ASM_AVR32_BARRIER_H
 #define __ASM_AVR32_BARRIER_H
 
-#define nop()			asm volatile("nop")
-
 #define mb()			asm volatile("" : : : "memory")
 #define rmb()			mb()
 #define wmb()			asm volatile("sync 0" : : : "memory")

diff --git a/trunk/arch/avr32/include/asm/special_insns.h b/trunk/arch/avr32/include/asm/special_insns.h
@@ -0,0 +1,13 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __ASM_AVR32_SPECIAL_INSNS_H
+#define __ASM_AVR32_SPECIAL_INSNS_H
+
+#define nop() asm volatile("nop")
+
+#endif /* __ASM_AVR32_SPECIAL_INSNS_H */
diff --git a/trunk/arch/m68k/include/asm/atomic.h b/trunk/arch/m68k/include/asm/atomic.h
@@ -3,7 +3,6 @@
 
 #include <linux/types.h>
 #include <linux/irqflags.h>
-#include <asm/cmpxchg.h>
 
 /*
  * Atomic operations that C can't guarantee us.  Useful for

diff --git a/trunk/arch/m68k/mac/config.c b/trunk/arch/m68k/mac/config.c
@@ -980,9 +980,6 @@ int __init mac_platform_init(void)
 {
 	u8 *swim_base;
 
-	if (!MACH_IS_MAC)
-		return -ENODEV;
-
 	/*
 	 * Serial devices
 	 */

diff --git a/trunk/arch/m68k/q40/config.c b/trunk/arch/m68k/q40/config.c
@@ -334,9 +334,6 @@ static __init int q40_add_kbd_device(void)
 {
 	struct platform_device *pdev;
 
-	if (!MACH_IS_Q40)
-		return -ENODEV;
-
 	pdev = platform_device_register_simple("q40kbd", -1, NULL, 0);
 	if (IS_ERR(pdev))
 		return PTR_ERR(pdev);

diff --git a/trunk/arch/microblaze/include/asm/cmpxchg.h b/trunk/arch/microblaze/include/asm/cmpxchg.h
@@ -1,8 +1,6 @@
 #ifndef _ASM_MICROBLAZE_CMPXCHG_H
 #define _ASM_MICROBLAZE_CMPXCHG_H
 
-#include <linux/irqflags.h>
-
 void __bad_xchg(volatile void *ptr, int size);
 
 static inline unsigned long __xchg(unsigned long x, volatile void *ptr,

diff --git a/trunk/arch/microblaze/include/asm/futex.h b/trunk/arch/microblaze/include/asm/futex.h
@@ -24,7 +24,7 @@
 			.word	1b,4b,2b,4b;				\
 			.previous;"					\
 	: "=&r" (oldval), "=&r" (ret)					\
-	: "r" (uaddr), "i" (-EFAULT), "r" (oparg)			\
+	: "b" (uaddr), "i" (-EFAULT), "r" (oparg)			\
 	);								\
 })
 

diff --git a/trunk/arch/microblaze/include/asm/processor.h b/trunk/arch/microblaze/include/asm/processor.h
@@ -31,8 +31,6 @@ extern const struct seq_operations cpuinfo_op;
 /* Do necessary setup to start up a newly executed thread. */
 void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long usp);
 
-extern void ret_from_fork(void);
-
 # endif /* __ASSEMBLY__ */
 
 # ifndef CONFIG_MMU
@@ -145,6 +143,8 @@ static inline void exit_thread(void)
 
 unsigned long get_wchan(struct task_struct *p);
 
+extern void ret_from_fork(void);
+
 /* The size allocated for kernel stacks. This _must_ be a power of two! */
 # define KERNEL_STACK_SIZE	0x2000
 

diff --git a/trunk/arch/microblaze/kernel/early_printk.c b/trunk/arch/microblaze/kernel/early_printk.c
@@ -176,7 +176,6 @@ void __init remap_early_printk(void)
 	base_addr = (u32) ioremap(base_addr, PAGE_SIZE);
 	printk(KERN_CONT "0x%x\n", base_addr);
 
-#ifdef CONFIG_MMU
 	/*
 	 * Early console is on the top of skipped TLB entries
 	 * decrease tlb_skip size ensure that hardcoded TLB entry will be
@@ -190,7 +189,6 @@ void __init remap_early_printk(void)
 	 *  cmp rX, orig_base_addr
 	 */
 	tlb_skip -= 1;
-#endif
 }
 
 void __init disable_early_printk(void)

diff --git a/trunk/arch/microblaze/kernel/setup.c b/trunk/arch/microblaze/kernel/setup.c
@@ -206,7 +206,6 @@ static int microblaze_debugfs_init(void)
 }
 arch_initcall(microblaze_debugfs_init);
 
-# ifdef CONFIG_MMU
 static int __init debugfs_tlb(void)
 {
 	struct dentry *d;
@@ -219,7 +218,6 @@ static int __init debugfs_tlb(void)
 		return -ENOMEM;
 }
 device_initcall(debugfs_tlb);
-# endif
 #endif
 
 static int dflt_bus_notify(struct notifier_block *nb,

diff --git a/trunk/arch/microblaze/kernel/unwind.c b/trunk/arch/microblaze/kernel/unwind.c
@@ -24,7 +24,6 @@
 #include <asm/sections.h>
 #include <asm/exceptions.h>
 #include <asm/unwind.h>
-#include <asm/switch_to.h>
 
 struct stack_trace;
 

diff --git a/trunk/arch/microblaze/lib/uaccess_old.S b/trunk/arch/microblaze/lib/uaccess_old.S
@@ -122,22 +122,22 @@ __strnlen_user:
 15:	swi	r24, r5, 0x0018 + offset;	\
 16:	swi	r25, r5, 0x001C + offset;	\
 	.section __ex_table,"a";		\
-	.word	1b, 33f;			\
-	.word	2b, 33f;			\
-	.word	3b, 33f;			\
-	.word	4b, 33f;			\
-	.word	5b, 33f;			\
-	.word	6b, 33f;			\
-	.word	7b, 33f;			\
-	.word	8b, 33f;			\
-	.word	9b, 33f;			\
-	.word	10b, 33f;			\
-	.word	11b, 33f;			\
-	.word	12b, 33f;			\
-	.word	13b, 33f;			\
-	.word	14b, 33f;			\
-	.word	15b, 33f;			\
-	.word	16b, 33f;			\
+	.word	1b, 0f;				\
+	.word	2b, 0f;				\
+	.word	3b, 0f;				\
+	.word	4b, 0f;				\
+	.word	5b, 0f;				\
+	.word	6b, 0f;				\
+	.word	7b, 0f;				\
+	.word	8b, 0f;				\
+	.word	9b, 0f;				\
+	.word	10b, 0f;			\
+	.word	11b, 0f;			\
+	.word	12b, 0f;			\
+	.word	13b, 0f;			\
+	.word	14b, 0f;			\
+	.word	15b, 0f;			\
+	.word	16b, 0f;			\
 	.text
 
 #define COPY_80(offset)	\
@@ -190,62 +190,36 @@ w2:	sw	r4, r5, r3
 
 .align 4 /* Alignment is important to keep icache happy */
 page:	/* Create room on stack and save registers for storign values */
-	addik   r1, r1, -40
-	swi	r5, r1, 0
-	swi	r6, r1, 4
-	swi	r7, r1, 8
-	swi	r19, r1, 12
-	swi	r20, r1, 16
-	swi	r21, r1, 20
-	swi	r22, r1, 24
-	swi	r23, r1, 28
-	swi	r24, r1, 32
-	swi	r25, r1, 36
+	addik   r1, r1, -32
+	swi	r19, r1, 4
+	swi	r20, r1, 8
+	swi	r21, r1, 12
+	swi	r22, r1, 16
+	swi	r23, r1, 20
+	swi	r24, r1, 24
+	swi	r25, r1, 28
 loop:	/* r4, r19, r20, r21, r22, r23, r24, r25 are used for storing values */
 	/* Loop unrolling to get performance boost */
 	COPY_80(0x000);
 	COPY_80(0x080);
 	COPY_80(0x100);
 	COPY_80(0x180);
 	/* copy loop */
-	addik   r6, r6, 0x200
-	addik   r7, r7, -0x200
-	bneid   r7, loop
-	addik   r5, r5, 0x200
-
+	addik	r6, r6, 0x200
+	addik	r7, r7, -0x200
+	bneid	r7, loop
+	addik	r5, r5, 0x200
 	/* Restore register content */
-	lwi	r5, r1, 0
-	lwi	r6, r1, 4
-	lwi	r7, r1, 8
-	lwi	r19, r1, 12
-	lwi	r20, r1, 16
-	lwi	r21, r1, 20
-	lwi	r22, r1, 24
-	lwi	r23, r1, 28
-	lwi	r24, r1, 32
-	lwi	r25, r1, 36
-	addik   r1, r1, 40
+	lwi	r19, r1, 4
+	lwi	r20, r1, 8
+	lwi	r21, r1, 12
+	lwi	r22, r1, 16
+	lwi	r23, r1, 20
+	lwi	r24, r1, 24
+	lwi	r25, r1, 28
+	addik   r1, r1, 32
 	/* return back */
-	addik	r3, r0, 0
-	rtsd	r15, 8
-	nop
-
-/* Fault case - return temp count */
-33:
 	addik	r3, r7, 0
-	/* Restore register content */
-	lwi	r5, r1, 0
-	lwi	r6, r1, 4
-	lwi	r7, r1, 8
-	lwi	r19, r1, 12
-	lwi	r20, r1, 16
-	lwi	r21, r1, 20
-	lwi	r22, r1, 24
-	lwi	r23, r1, 28
-	lwi	r24, r1, 32
-	lwi	r25, r1, 36
-	addik   r1, r1, 40
-	/* return back */
 	rtsd	r15, 8
 	nop
 

diff --git a/trunk/arch/sparc/include/asm/pgtable_64.h b/trunk/arch/sparc/include/asm/pgtable_64.h
@@ -12,6 +12,8 @@
  * the SpitFire page tables.
  */
 
+#include <asm-generic/pgtable-nopud.h>
+
 #include <linux/compiler.h>
 #include <linux/const.h>
 #include <asm/types.h>
@@ -20,8 +22,6 @@
 #include <asm/page.h>
 #include <asm/processor.h>
 
-#include <asm-generic/pgtable-nopud.h>
-
 /* The kernel image occupies 0x4000000 to 0x6000000 (4MB --> 96MB).
  * The page copy blockops can use 0x6000000 to 0x8000000.
  * The TSB is mapped in the 0x8000000 to 0xa000000 range.