lael-labs/linux

CREDITS+4−4

@@ -3554,12 +3554,12 @@ E: cvance@nai.com · 3553 unmodified lines
3554	D: portions of the Linux Security Module (LSM) framework and security modules	3554	D: portions of the Linux Security Module (LSM) framework and security modules
3555		3555
3556	N: Petr Vandrovec	3556	N: Petr Vandrovec
3557	E: vandrove@vc.cvut.cz	3557	E: petr@vandrovec.name
3558	D: Small contributions to ncpfs	3558	D: Small contributions to ncpfs
3559	D: Matrox framebuffer driver	3559	D: Matrox framebuffer driver
3560	S: Chudenicka 8	3560	S: 21513 Conradia Ct
3561	S: 10200 Prague 10, Hostivar	3561	S: Cupertino, CA 95014
3562	S: Czech Republic	3562	S: USA
3563		3563
3564	N: Thibaut Varene	3564	N: Thibaut Varene
3565	E: T-Bone@parisc-linux.org	3565	E: T-Bone@parisc-linux.org

MAINTAINERS+27−11

@@ -962,6 +962,13 @@ W: http://www.fluff.org/ben/linux/ · 961 unmodified lines
962	S: Maintained	962	S: Maintained
963	F: arch/arm/mach-s3c6410/	963	F: arch/arm/mach-s3c6410/
964		964
		965	ARM/S5P ARM ARCHITECTURES
		966	M: Kukjin Kim <kgene.kim@samsung.com>
		967	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		968	L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
		969	S: Maintained
		970	F: arch/arm/mach-s5p*/
		971
965	ARM/SHMOBILE ARM ARCHITECTURE	972	ARM/SHMOBILE ARM ARCHITECTURE
966	M: Paul Mundt <lethal@linux-sh.org>	973	M: Paul Mundt <lethal@linux-sh.org>
967	M: Magnus Damm <magnus.damm@gmail.com>	974	M: Magnus Damm <magnus.damm@gmail.com>
@@ -1220,7 +1227,7 @@ F: drivers/auxdisplay/ · 252 unmodified lines
1220	F: include/linux/cfag12864b.h	1227	F: include/linux/cfag12864b.h
1221		1228
1222	AVR32 ARCHITECTURE	1229	AVR32 ARCHITECTURE
1223	M: Haavard Skinnemoen <hskinnemoen@atmel.com>	1230	M: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
1224	W: http://www.atmel.com/products/AVR32/	1231	W: http://www.atmel.com/products/AVR32/
1225	W: http://avr32linux.org/	1232	W: http://avr32linux.org/
1226	W: http://avrfreaks.net/	1233	W: http://avrfreaks.net/
@@ -1228,7 +1235,7 @@ S: Supported · 1 unmodified line
1228	F: arch/avr32/	1235	F: arch/avr32/
1229		1236
1230	AVR32/AT32AP MACHINE SUPPORT	1237	AVR32/AT32AP MACHINE SUPPORT
1231	M: Haavard Skinnemoen <hskinnemoen@atmel.com>	1238	M: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
1232	S: Supported	1239	S: Supported
1233	F: arch/avr32/mach-at32ap/	1240	F: arch/avr32/mach-at32ap/
1234		1241
@@ -2199,6 +2206,12 @@ W: http://acpi4asus.sf.net · 964 unmodified lines
2199	S: Maintained	2206	S: Maintained
2200	F: drivers/platform/x86/eeepc-laptop.c	2207	F: drivers/platform/x86/eeepc-laptop.c
2201		2208
		2209	EFIFB FRAMEBUFFER DRIVER
		2210	L: linux-fbdev@vger.kernel.org
		2211	M: Peter Jones <pjones@redhat.com>
		2212	S: Maintained
		2213	F: drivers/video/efifb.c
		2214
2202	EFS FILESYSTEM	2215	EFS FILESYSTEM
2203	W: http://aeschi.ch.eu.org/efs/	2216	W: http://aeschi.ch.eu.org/efs/
2204	S: Orphan	2217	S: Orphan
@@ -2662,6 +2675,8 @@ M: Guenter Roeck <guenter.roeck@ericsson.com> · 457 unmodified lines
2662	L: lm-sensors@lm-sensors.org	2675	L: lm-sensors@lm-sensors.org
2663	W: http://www.lm-sensors.org/	2676	W: http://www.lm-sensors.org/
2664	T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/	2677	T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
		2678	T: quilt kernel.org/pub/linux/kernel/people/groeck/linux-staging/
		2679	T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
2665	S: Maintained	2680	S: Maintained
2666	F: Documentation/hwmon/	2681	F: Documentation/hwmon/
2667	F: drivers/hwmon/	2682	F: drivers/hwmon/
@@ -3773,9 +3788,8 @@ W: http://www.syskonnect.com · 1105 unmodified lines
3773	S: Supported	3788	S: Supported
3774		3789
3775	MATROX FRAMEBUFFER DRIVER	3790	MATROX FRAMEBUFFER DRIVER
3776	M: Petr Vandrovec <vandrove@vc.cvut.cz>
3777	L: linux-fbdev@vger.kernel.org	3791	L: linux-fbdev@vger.kernel.org
3778	S: Maintained	3792	S: Orphan
3779	F: drivers/video/matrox/matroxfb_*	3793	F: drivers/video/matrox/matroxfb_*
3780	F: include/linux/matroxfb.h	3794	F: include/linux/matroxfb.h
3781		3795
@@ -3899,10 +3913,8 @@ F: Documentation/serial/moxa-smartio · 117 unmodified lines
3899	F: drivers/char/mxser.*	3913	F: drivers/char/mxser.*
3900		3914
3901	MSI LAPTOP SUPPORT	3915	MSI LAPTOP SUPPORT
3902	M: Lennart Poettering <mzxreary@0pointer.de>	3916	M: Lee, Chun-Yi <jlee@novell.com>
3903	L: platform-driver-x86@vger.kernel.org	3917	L: platform-driver-x86@vger.kernel.org
3904	W: https://tango.0pointer.de/mailman/listinfo/s270-linux
3905	W: http://0pointer.de/lennart/tchibo.html
3906	S: Maintained	3918	S: Maintained
3907	F: drivers/platform/x86/msi-laptop.c	3919	F: drivers/platform/x86/msi-laptop.c
3908		3920
@@ -3919,8 +3931,10 @@ S: Supported · 10 unmodified lines
3919	F: drivers/mfd/	3931	F: drivers/mfd/
3920		3932
3921	MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM	3933	MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
3922	S: Orphan	3934	M: Chris Ball <cjb@laptop.org>
3923	L: linux-mmc@vger.kernel.org	3935	L: linux-mmc@vger.kernel.org
		3936	T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
		3937	S: Maintained
3924	F: drivers/mmc/	3938	F: drivers/mmc/
3925	F: include/linux/mmc/	3939	F: include/linux/mmc/
3926		3940
@@ -3962,8 +3976,8 @@ S: Maintained · 35 unmodified lines
3962	F: drivers/net/natsemi.c	3976	F: drivers/net/natsemi.c
3963		3977
3964	NCP FILESYSTEM	3978	NCP FILESYSTEM
3965	M: Petr Vandrovec <vandrove@vc.cvut.cz>	3979	M: Petr Vandrovec <petr@vandrovec.name>
3966	S: Maintained	3980	S: Odd Fixes
3967	F: fs/ncpfs/	3981	F: fs/ncpfs/
3968		3982
3969	NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)	3983	NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
@@ -5091,8 +5105,10 @@ S: Maintained · 1121 unmodified lines
5091	F: drivers/mmc/host/sdricoh_cs.c	5105	F: drivers/mmc/host/sdricoh_cs.c
5092		5106
5093	SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER	5107	SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
5094	S: Orphan	5108	M: Chris Ball <cjb@laptop.org>
5095	L: linux-mmc@vger.kernel.org	5109	L: linux-mmc@vger.kernel.org
		5110	T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
		5111	S: Maintained
5096	F: drivers/mmc/host/sdhci.*	5112	F: drivers/mmc/host/sdhci.*
5097		5113
5098	SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)	5114	SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)

Makefile+1−1

@@ -1,7 +1,7 @@
1	VERSION = 2	1	VERSION = 2
2	PATCHLEVEL = 6	2	PATCHLEVEL = 6
3	SUBLEVEL = 36	3	SUBLEVEL = 36
4	EXTRAVERSION = -rc5	4	EXTRAVERSION = -rc7
5	NAME = Sheep on Meth	5	NAME = Sheep on Meth
6		6
7	# DOCUMENTATION	7	# DOCUMENTATION

arch/alpha/kernel/entry.S+7−13

 	ldq	$20, HAE_REG($19);	\
 	stq	$21, HAE_CACHE($19);	\
 	stq	$21, 0($20);		\
-	ldq	$0, 0($sp);		\
-	ldq	$1, 8($sp);		\
 99:;					\
 	ldq	$19, 72($sp);		\
 	ldq	$20, 80($sp);		\
 	cmovne	$26, 0, $19		/* $19 = 0 => non-restartable */
 	ldq	$0, SP_OFF($sp)
 	and	$0, 8, $0
-	beq	$0, restore_all
+	beq	$0, ret_to_kernel
 ret_to_user:
 	/* Make sure need_resched and sigpending don't change between
 		sampling and the rti.  */
 	RESTORE_ALL
 	call_pal PAL_rti
+ret_to_kernel:
+	lda	$16, 7
+	call_pal PAL_swpipl
+	br restore_all
 	.align 3
 $syscall_error:
 	/*
 	/* We don't actually care for a3 success widgetry in the kernel.
 	   Not for positive errno values.  */
 	stq	$0, 0($sp)		/* $0 */
-	br	restore_all
+	br	ret_to_kernel
 .end kernel_thread
 /*
 	jmp	$31, do_sys_execve
 .end sys_execve
-	.align	4
-	.globl	osf_sigprocmask
-	.ent	osf_sigprocmask
-osf_sigprocmask:
-	.prologue 0
-	mov	$sp, $18
-	jmp	$31, sys_osf_sigprocmask
-.end osf_sigprocmask
 	.align	4
 	.globl	alpha_ni_syscall
 	.ent	alpha_ni_syscall

arch/alpha/kernel/process.c+1−1

@@ -356,7 +356,7 @@ dump_elf_thread(elf_greg_t dest, struct pt_regs pt, struct thread_info *ti) · 355 unmodified lines
356	dest[27] = pt->r27;	356	dest[27] = pt->r27;
357	dest[28] = pt->r28;	357	dest[28] = pt->r28;
358	dest[29] = pt->gp;	358	dest[29] = pt->gp;
359	dest[30] = rdusp();	359	dest[30] = ti == current_thread_info() ? rdusp() : ti->pcb.usp;
360	dest[31] = pt->pc;	360	dest[31] = pt->pc;
361		361
362	/* Once upon a time this was the PS value. Which is stupid	362	/* Once upon a time this was the PS value. Which is stupid

arch/alpha/kernel/signal.c+15−41

@@ -41,46 +41,20 @@ static void do_signal(struct pt_regs , struct switch_stack , · 40 unmodified lines
41	/*	41	/*
42	* The OSF/1 sigprocmask calling sequence is different from the	42	* The OSF/1 sigprocmask calling sequence is different from the
43	* C sigprocmask() sequence..	43	* C sigprocmask() sequence..
44	*
45	* how:
46	* 1 - SIG_BLOCK
47	* 2 - SIG_UNBLOCK
48	* 3 - SIG_SETMASK
49	*
50	* We change the range to -1 .. 1 in order to let gcc easily
51	* use the conditional move instructions.
52	*
53	* Note that we don't need to acquire the kernel lock for SMP
54	* operation, as all of this is local to this thread.
55	*/	44	*/
56	SYSCALL_DEFINE3(osf_sigprocmask, int, how, unsigned long, newmask,	45	SYSCALL_DEFINE2(osf_sigprocmask, int, how, unsigned long, newmask)
57	struct pt_regs *, regs)
58	{	46	{
59	unsigned long oldmask = -EINVAL;	47	sigset_t oldmask;
60		48	sigset_t mask;
61	if ((unsigned long)how-1 <= 2) {	49	unsigned long res;
62	long sign = how-2; /* -1 .. 1 */	50
63	unsigned long block, unblock;	51	siginitset(&mask, newmask & _BLOCKABLE);
64		52	res = sigprocmask(how, &mask, &oldmask);
65	newmask &= _BLOCKABLE;	53	if (!res) {
66	spin_lock_irq(&current->sighand->siglock);	54	force_successful_syscall_return();
67	oldmask = current->blocked.sig[0];	55	res = oldmask.sig[0];
68
69	unblock = oldmask & ~newmask;
70	block = oldmask \| newmask;
71	if (!sign)
72	block = unblock;
73	if (sign <= 0)
74	newmask = block;
75	if (_NSIG_WORDS > 1 && sign > 0)
76	sigemptyset(&current->blocked);
77	current->blocked.sig[0] = newmask;
78	recalc_sigpending();
79	spin_unlock_irq(&current->sighand->siglock);
80
81	regs->r0 = 0; /* special no error return */
82	}	56	}
83	return oldmask;	57	return res;
84	}	58	}
85		59
86	SYSCALL_DEFINE3(osf_sigaction, int, sig,	60	SYSCALL_DEFINE3(osf_sigaction, int, sig,
@@ -94,9 +68,9 @@ SYSCALL_DEFINE3(osf_sigaction, int, sig, · 7 unmodified lines
94	old_sigset_t mask;	68	old_sigset_t mask;
95	if (!access_ok(VERIFY_READ, act, sizeof(*act)) \|\|	69	if (!access_ok(VERIFY_READ, act, sizeof(*act)) \|\|
96	__get_user(new_ka.sa.sa_handler, &act->sa_handler) \|\|	70	__get_user(new_ka.sa.sa_handler, &act->sa_handler) \|\|
97	__get_user(new_ka.sa.sa_flags, &act->sa_flags))	71	__get_user(new_ka.sa.sa_flags, &act->sa_flags) \|\|
		72	__get_user(mask, &act->sa_mask))
98	return -EFAULT;	73	return -EFAULT;
99	__get_user(mask, &act->sa_mask);
100	siginitset(&new_ka.sa.sa_mask, mask);	74	siginitset(&new_ka.sa.sa_mask, mask);
101	new_ka.ka_restorer = NULL;	75	new_ka.ka_restorer = NULL;
102	}	76	}
@@ -106,9 +80,9 @@ SYSCALL_DEFINE3(osf_sigaction, int, sig, · 3 unmodified lines
106	if (!ret && oact) {	80	if (!ret && oact) {
107	if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) \|\|	81	if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) \|\|
108	__put_user(old_ka.sa.sa_handler, &oact->sa_handler) \|\|	82	__put_user(old_ka.sa.sa_handler, &oact->sa_handler) \|\|
109	__put_user(old_ka.sa.sa_flags, &oact->sa_flags))	83	__put_user(old_ka.sa.sa_flags, &oact->sa_flags) \|\|
		84	__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))
110	return -EFAULT;	85	return -EFAULT;
111	__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
112	}	86	}
113		87
114	return ret;	88	return ret;

arch/alpha/kernel/systbls.S+1−1

@@ -58,7 +58,7 @@ sys_call_table: · 57 unmodified lines
58	.quad sys_open /* 45 */	58	.quad sys_open /* 45 */
59	.quad alpha_ni_syscall	59	.quad alpha_ni_syscall
60	.quad sys_getxgid	60	.quad sys_getxgid
61	.quad osf_sigprocmask	61	.quad sys_osf_sigprocmask
62	.quad alpha_ni_syscall	62	.quad alpha_ni_syscall
63	.quad alpha_ni_syscall /* 50 */	63	.quad alpha_ni_syscall /* 50 */
64	.quad sys_acct	64	.quad sys_acct

arch/arm/Kconfig+26−1

@@ -271,7 +271,6 @@ config ARCH_AT91 · 270 unmodified lines
271	bool "Atmel AT91"	271	bool "Atmel AT91"
272	select ARCH_REQUIRE_GPIOLIB	272	select ARCH_REQUIRE_GPIOLIB
273	select HAVE_CLK	273	select HAVE_CLK
274	select ARCH_USES_GETTIMEOFFSET
275	help	274	help
276	This enables support for systems based on the Atmel AT91RM9200,	275	This enables support for systems based on the Atmel AT91RM9200,
277	AT91SAM9 and AT91CAP9 processors.	276	AT91SAM9 and AT91CAP9 processors.
@@ -1051,6 +1050,32 @@ config ARM_ERRATA_460075 · 773 unmodified lines
1051	ACTLR register. Note that setting specific bits in the ACTLR register	1050	ACTLR register. Note that setting specific bits in the ACTLR register
1052	may not be available in non-secure mode.	1051	may not be available in non-secure mode.
1053		1052
		1053	config ARM_ERRATA_742230
		1054	bool "ARM errata: DMB operation may be faulty"
		1055	depends on CPU_V7 && SMP
		1056	help
		1057	This option enables the workaround for the 742230 Cortex-A9
		1058	(r1p0..r2p2) erratum. Under rare circumstances, a DMB instruction
		1059	between two write operations may not ensure the correct visibility
		1060	ordering of the two writes. This workaround sets a specific bit in
		1061	the diagnostic register of the Cortex-A9 which causes the DMB
		1062	instruction to behave as a DSB, ensuring the correct behaviour of
		1063	the two writes.
		1064
		1065	config ARM_ERRATA_742231
		1066	bool "ARM errata: Incorrect hazard handling in the SCU may lead to data corruption"
		1067	depends on CPU_V7 && SMP
		1068	help
		1069	This option enables the workaround for the 742231 Cortex-A9
		1070	(r2p0..r2p2) erratum. Under certain conditions, specific to the
		1071	Cortex-A9 MPCore micro-architecture, two CPUs working in SMP mode,
		1072	accessing some data located in the same cache line, may get corrupted
		1073	data due to bad handling of the address hazard when the line gets
		1074	replaced from one of the CPUs at the same time as another CPU is
		1075	accessing it. This workaround sets specific bits in the diagnostic
		1076	register of the Cortex-A9 which reduces the linefill issuing
		1077	capabilities of the processor.
		1078
1054	config PL310_ERRATA_588369	1079	config PL310_ERRATA_588369
1055	bool "Clean & Invalidate maintenance operations do not invalidate clean lines"	1080	bool "Clean & Invalidate maintenance operations do not invalidate clean lines"
1056	depends on CACHE_L2X0 && ARCH_OMAP4	1081	depends on CACHE_L2X0 && ARCH_OMAP4

arch/arm/boot/compressed/Makefile+1−1

@@ -116,5 +116,5 @@ CFLAGS_font.o := -Dstatic= · 115 unmodified lines
116	$(obj)/font.c: $(FONTC)	116	$(obj)/font.c: $(FONTC)
117	$(call cmd,shipped)	117	$(call cmd,shipped)
118		118
119	$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config	119	$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile $(KCONFIG_CONFIG)
120	@sed "$(SEDFLAGS)" < $< > $@	120	@sed "$(SEDFLAGS)" < $< > $@

arch/arm/common/it8152.c+8−0

@@ -271,6 +271,14 @@ int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size) · 270 unmodified lines
271	((dma_addr + size - PHYS_OFFSET) >= SZ_64M);	271	((dma_addr + size - PHYS_OFFSET) >= SZ_64M);
272	}	272	}
273		273
		274	int dma_set_coherent_mask(struct device *dev, u64 mask)
		275	{
		276	if (mask >= PHYS_OFFSET + SZ_64M - 1)
		277	return 0;
		278
		279	return -EIO;
		280	}
		281
274	int __init it8152_pci_setup(int nr, struct pci_sys_data *sys)	282	int __init it8152_pci_setup(int nr, struct pci_sys_data *sys)
275	{	283	{
276	it8152_io.start = IT8152_IO_BASE + 0x12000;	284	it8152_io.start = IT8152_IO_BASE + 0x12000;

arch/arm/include/asm/pgtable.h+4−0

 #ifdef CONFIG_ARM_DMA_MEM_BUFFERABLE
 #define pgprot_dmacoherent(prot) \
 	__pgprot_modify(prot, L_PTE_MT_MASK|L_PTE_EXEC, L_PTE_MT_BUFFERABLE)
+#define __HAVE_PHYS_MEM_ACCESS_PROT
+struct file;
+extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
+				     unsigned long size, pgprot_t vma_prot);
 #else
 #define pgprot_dmacoherent(prot) \
 	__pgprot_modify(prot, L_PTE_MT_MASK|L_PTE_EXEC, L_PTE_MT_UNCACHED)

arch/arm/kernel/entry-common.S+2−0

@@ -48,6 +48,8 @@ work_pending: · 47 unmodified lines
48	beq no_work_pending	48	beq no_work_pending
49	mov r0, sp @ 'regs'	49	mov r0, sp @ 'regs'
50	mov r2, why @ 'syscall'	50	mov r2, why @ 'syscall'
		51	tst r1, #_TIF_SIGPENDING @ delivering a signal?
		52	movne why, #0 @ prevent further restarts
51	bl do_notify_resume	53	bl do_notify_resume
52	b ret_slow_syscall @ Check work again	54	b ret_slow_syscall @ Check work again
53		55

arch/arm/mach-at91/at91sam9g45_devices.c+2−2

@@ -426,7 +426,7 @@ static struct i2c_gpio_platform_data pdata_i2c0 = { · 425 unmodified lines
426	.sda_is_open_drain = 1,	426	.sda_is_open_drain = 1,
427	.scl_pin = AT91_PIN_PA21,	427	.scl_pin = AT91_PIN_PA21,
428	.scl_is_open_drain = 1,	428	.scl_is_open_drain = 1,
429	.udelay = 2, /* ~100 kHz */	429	.udelay = 5, /* ~100 kHz */
430	};	430	};
431		431
432	static struct platform_device at91sam9g45_twi0_device = {	432	static struct platform_device at91sam9g45_twi0_device = {
@@ -440,7 +440,7 @@ static struct i2c_gpio_platform_data pdata_i2c1 = { · 7 unmodified lines
440	.sda_is_open_drain = 1,	440	.sda_is_open_drain = 1,
441	.scl_pin = AT91_PIN_PB11,	441	.scl_pin = AT91_PIN_PB11,
442	.scl_is_open_drain = 1,	442	.scl_is_open_drain = 1,
443	.udelay = 2, /* ~100 kHz */	443	.udelay = 5, /* ~100 kHz */
444	};	444	};
445		445
446	static struct platform_device at91sam9g45_twi1_device = {	446	static struct platform_device at91sam9g45_twi1_device = {

arch/arm/mach-davinci/dm355.c+1−2

@@ -769,8 +769,7 @@ static struct map_desc dm355_io_desc[] = { · 768 unmodified lines
769	.virtual = SRAM_VIRT,	769	.virtual = SRAM_VIRT,
770	.pfn = __phys_to_pfn(0x00010000),	770	.pfn = __phys_to_pfn(0x00010000),
771	.length = SZ_32K,	771	.length = SZ_32K,
772	/* MT_MEMORY_NONCACHED requires supersection alignment */	772	.type = MT_MEMORY_NONCACHED,
773	.type = MT_DEVICE,
774	},	773	},
775	};	774	};
776		775

arch/arm/mach-davinci/dm365.c+1−2

@@ -969,8 +969,7 @@ static struct map_desc dm365_io_desc[] = { · 968 unmodified lines
969	.virtual = SRAM_VIRT,	969	.virtual = SRAM_VIRT,
970	.pfn = __phys_to_pfn(0x00010000),	970	.pfn = __phys_to_pfn(0x00010000),
971	.length = SZ_32K,	971	.length = SZ_32K,
972	/* MT_MEMORY_NONCACHED requires supersection alignment */	972	.type = MT_MEMORY_NONCACHED,
973	.type = MT_DEVICE,
974	},	973	},
975	};	974	};
976		975

arch/arm/mach-davinci/dm644x.c+1−2

@@ -653,8 +653,7 @@ static struct map_desc dm644x_io_desc[] = { · 652 unmodified lines
653	.virtual = SRAM_VIRT,	653	.virtual = SRAM_VIRT,
654	.pfn = __phys_to_pfn(0x00008000),	654	.pfn = __phys_to_pfn(0x00008000),
655	.length = SZ_16K,	655	.length = SZ_16K,
656	/* MT_MEMORY_NONCACHED requires supersection alignment */	656	.type = MT_MEMORY_NONCACHED,
657	.type = MT_DEVICE,
658	},	657	},
659	};	658	};
660		659

arch/arm/mach-davinci/dm646x.c+1−2

@@ -737,8 +737,7 @@ static struct map_desc dm646x_io_desc[] = { · 736 unmodified lines
737	.virtual = SRAM_VIRT,	737	.virtual = SRAM_VIRT,
738	.pfn = __phys_to_pfn(0x00010000),	738	.pfn = __phys_to_pfn(0x00010000),
739	.length = SZ_32K,	739	.length = SZ_32K,
740	/* MT_MEMORY_NONCACHED requires supersection alignment */	740	.type = MT_MEMORY_NONCACHED,
741	.type = MT_DEVICE,
742	},	741	},
743	};	742	};
744		743

arch/arm/mach-dove/include/mach/io.h+3−3

@@ -13,8 +13,8 @@ · 12 unmodified lines
13		13
14	#define IO_SPACE_LIMIT 0xffffffff	14	#define IO_SPACE_LIMIT 0xffffffff
15		15
16	#define __io(a) ((void __iomem *)(((a) - DOVE_PCIE0_IO_PHYS_BASE) +\	16	#define __io(a) ((void __iomem *)(((a) - DOVE_PCIE0_IO_BUS_BASE) + \
17	DOVE_PCIE0_IO_VIRT_BASE))	17	DOVE_PCIE0_IO_VIRT_BASE))
18	#define __mem_pci(a) (a)	18	#define __mem_pci(a) (a)
19		19
20	#endif	20	#endif

arch/arm/mach-ixp4xx/common-pci.c+8−0

@@ -503,6 +503,14 @@ struct pci_bus * __devinit ixp4xx_scan_bus(int nr, struct pci_sys_data *sys) · 502 unmodified lines
503	return pci_scan_bus(sys->busnr, &ixp4xx_ops, sys);	503	return pci_scan_bus(sys->busnr, &ixp4xx_ops, sys);
504	}	504	}
505		505
		506	int dma_set_coherent_mask(struct device *dev, u64 mask)
		507	{
		508	if (mask >= SZ_64M - 1)
		509	return 0;
		510
		511	return -EIO;
		512	}
		513
506	EXPORT_SYMBOL(ixp4xx_pci_read);	514	EXPORT_SYMBOL(ixp4xx_pci_read);
507	EXPORT_SYMBOL(ixp4xx_pci_write);	515	EXPORT_SYMBOL(ixp4xx_pci_write);
508		516

arch/arm/mach-ixp4xx/include/mach/hardware.h+2−0

@@ -26,6 +26,8 @@ · 25 unmodified lines
26	#define PCIBIOS_MAX_MEM 0x4BFFFFFF	26	#define PCIBIOS_MAX_MEM 0x4BFFFFFF
27	#endif	27	#endif
28		28
		29	#define ARCH_HAS_DMA_SET_COHERENT_MASK
		30
29	#define pcibios_assign_all_busses() 1	31	#define pcibios_assign_all_busses() 1
30		32
31	/* Register locations and bits */	33	/* Register locations and bits */

arch/arm/mach-kirkwood/include/mach/kirkwood.h+1−1

@@ -38,7 +38,7 @@ · 37 unmodified lines
38		38
39	#define KIRKWOOD_PCIE1_IO_PHYS_BASE 0xf3000000	39	#define KIRKWOOD_PCIE1_IO_PHYS_BASE 0xf3000000
40	#define KIRKWOOD_PCIE1_IO_VIRT_BASE 0xfef00000	40	#define KIRKWOOD_PCIE1_IO_VIRT_BASE 0xfef00000
41	#define KIRKWOOD_PCIE1_IO_BUS_BASE 0x00000000	41	#define KIRKWOOD_PCIE1_IO_BUS_BASE 0x00100000
42	#define KIRKWOOD_PCIE1_IO_SIZE SZ_1M	42	#define KIRKWOOD_PCIE1_IO_SIZE SZ_1M
43		43
44	#define KIRKWOOD_PCIE_IO_PHYS_BASE 0xf2000000	44	#define KIRKWOOD_PCIE_IO_PHYS_BASE 0xf2000000

arch/arm/mach-kirkwood/pcie.c+2−2

@@ -117,7 +117,7 @@ static void __init pcie0_ioresources_init(struct pcie_port *pp) · 116 unmodified lines
117	* IORESOURCE_IO	117	* IORESOURCE_IO
118	*/	118	*/
119	pp->res[0].name = "PCIe 0 I/O Space";	119	pp->res[0].name = "PCIe 0 I/O Space";
120	pp->res[0].start = KIRKWOOD_PCIE_IO_PHYS_BASE;	120	pp->res[0].start = KIRKWOOD_PCIE_IO_BUS_BASE;
121	pp->res[0].end = pp->res[0].start + KIRKWOOD_PCIE_IO_SIZE - 1;	121	pp->res[0].end = pp->res[0].start + KIRKWOOD_PCIE_IO_SIZE - 1;
122	pp->res[0].flags = IORESOURCE_IO;	122	pp->res[0].flags = IORESOURCE_IO;
123		123
@@ -139,7 +139,7 @@ static void __init pcie1_ioresources_init(struct pcie_port *pp) · 15 unmodified lines
139	* IORESOURCE_IO	139	* IORESOURCE_IO
140	*/	140	*/
141	pp->res[0].name = "PCIe 1 I/O Space";	141	pp->res[0].name = "PCIe 1 I/O Space";
142	pp->res[0].start = KIRKWOOD_PCIE1_IO_PHYS_BASE;	142	pp->res[0].start = KIRKWOOD_PCIE1_IO_BUS_BASE;
143	pp->res[0].end = pp->res[0].start + KIRKWOOD_PCIE1_IO_SIZE - 1;	143	pp->res[0].end = pp->res[0].start + KIRKWOOD_PCIE1_IO_SIZE - 1;
144	pp->res[0].flags = IORESOURCE_IO;	144	pp->res[0].flags = IORESOURCE_IO;
145		145

arch/arm/mach-mmp/include/mach/system.h+6−1

 #ifndef __ASM_MACH_SYSTEM_H
 #define __ASM_MACH_SYSTEM_H
+#include <mach/cputype.h>
 static inline void arch_idle(void)
 {
 	cpu_do_idle();
 static inline void arch_reset(char mode, const char *cmd)
 {
-	cpu_reset(0);
+	if (cpu_is_pxa168())
+		cpu_reset(0xffff0000);
+	else
+		cpu_reset(0);
 }
 #endif /* __ASM_MACH_SYSTEM_H */

arch/arm/mach-pxa/cpufreq-pxa2xx.c+1−2

@@ -312,8 +312,7 @@ static int pxa_set_target(struct cpufreq_policy *policy, · 311 unmodified lines
312	freqs.cpu = policy->cpu;	312	freqs.cpu = policy->cpu;
313		313
314	if (freq_debug)	314	if (freq_debug)
315	pr_debug(KERN_INFO "Changing CPU frequency to %d Mhz, "	315	pr_debug("Changing CPU frequency to %d Mhz, (SDRAM %d Mhz)\n",
316	"(SDRAM %d Mhz)\n",
317	freqs.new / 1000, (pxa_freq_settings[idx].div2) ?	316	freqs.new / 1000, (pxa_freq_settings[idx].div2) ?
318	(new_freq_mem / 2000) : (new_freq_mem / 1000));	317	(new_freq_mem / 2000) : (new_freq_mem / 1000));
319		318

arch/arm/mach-pxa/include/mach/hardware.h+13−1

  * <= 0x2 for pxa21x/pxa25x/pxa26x/pxa27x
  * == 0x3 for pxa300/pxa310/pxa320
  */
+#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)
 #define __cpu_is_pxa2xx(id)				\
 	({						\
 		unsigned int _id = (id) >> 13 & 0x7;	\
 		_id <= 0x2;				\
 	 })
+#else
+#define __cpu_is_pxa2xx(id)	(0)
+#endif
+#ifdef CONFIG_PXA3xx
 #define __cpu_is_pxa3xx(id)				\
 	({						\
 		unsigned int _id = (id) >> 13 & 0x7;	\
 		_id == 0x3;				\
 	 })
+#else
+#define __cpu_is_pxa3xx(id)	(0)
+#endif
+#if defined(CONFIG_CPU_PXA930) || defined(CONFIG_CPU_PXA935)
 #define __cpu_is_pxa93x(id)				\
 	({						\
 		unsigned int _id = (id) >> 4 & 0xfff;	\
 		_id == 0x683 || _id == 0x693;		\
 	 })
+#else
+#define __cpu_is_pxa93x(id)	(0)
+#endif
 #define cpu_is_pxa2xx()					\
 	({						\
 #define PCIBIOS_MIN_IO		0
 #define PCIBIOS_MIN_MEM		0
 #define pcibios_assign_all_busses()	1
+#define ARCH_HAS_DMA_SET_COHERENT_MASK
 #endif
 #endif  /* _ASM_ARCH_HARDWARE_H */

arch/arm/mach-pxa/include/mach/io.h+2−0

@@ -6,6 +6,8 @@ · 5 unmodified lines
6	#ifndef __ASM_ARM_ARCH_IO_H	6	#ifndef __ASM_ARM_ARCH_IO_H
7	#define __ASM_ARM_ARCH_IO_H	7	#define __ASM_ARM_ARCH_IO_H
8		8
		9	#include <mach/hardware.h>
		10
9	#define IO_SPACE_LIMIT 0xffffffff	11	#define IO_SPACE_LIMIT 0xffffffff
10		12
11	/*	13	/*

arch/arm/mach-pxa/palm27x.c+5−1

 	},
 };
+static struct i2c_pxa_platform_data palm27x_i2c_power_info = {
+	.use_pio	= 1,
+};
 void __init palm27x_pmic_init(void)
 {
 	i2c_register_board_info(1, ARRAY_AND_SIZE(palm27x_pi2c_board_info));
-	pxa27x_set_i2c_power_info(NULL);
+	pxa27x_set_i2c_power_info(&palm27x_i2c_power_info);
 }
 #endif

arch/arm/mach-pxa/vpac270.c+1−0

@@ -240,6 +240,7 @@ static void __init vpac270_onenand_init(void) {} · 239 unmodified lines
240	#if defined(CONFIG_MMC_PXA) \|\| defined(CONFIG_MMC_PXA_MODULE)	240	#if defined(CONFIG_MMC_PXA) \|\| defined(CONFIG_MMC_PXA_MODULE)
241	static struct pxamci_platform_data vpac270_mci_platform_data = {	241	static struct pxamci_platform_data vpac270_mci_platform_data = {
242	.ocr_mask = MMC_VDD_32_33 \| MMC_VDD_33_34,	242	.ocr_mask = MMC_VDD_32_33 \| MMC_VDD_33_34,
		243	.gpio_power = -1,
243	.gpio_card_detect = GPIO53_VPAC270_SD_DETECT_N,	244	.gpio_card_detect = GPIO53_VPAC270_SD_DETECT_N,
244	.gpio_card_ro = GPIO52_VPAC270_SD_READONLY,	245	.gpio_card_ro = GPIO52_VPAC270_SD_READONLY,
245	.detect_delay_ms = 200,	246	.detect_delay_ms = 200,

arch/arm/mach-u300/include/mach/gpio.h+3−0

@@ -273,6 +273,9 @@ extern void gpio_pullup(unsigned gpio, int value); · 272 unmodified lines
273	extern int gpio_get_value(unsigned gpio);	273	extern int gpio_get_value(unsigned gpio);
274	extern void gpio_set_value(unsigned gpio, int value);	274	extern void gpio_set_value(unsigned gpio, int value);
275		275
		276	#define gpio_get_value_cansleep gpio_get_value
		277	#define gpio_set_value_cansleep gpio_set_value
		278
276	/* wrappers to sleep-enable the previous two functions */	279	/* wrappers to sleep-enable the previous two functions */
277	static inline unsigned gpio_to_irq(unsigned gpio)	280	static inline unsigned gpio_to_irq(unsigned gpio)
278	{	281	{

arch/arm/mach-vexpress/ct-ca9x4.c+7−1

 	int i;
 #ifdef CONFIG_CACHE_L2X0
-	l2x0_init(MMIO_P2V(CT_CA9X4_L2CC), 0x00000000, 0xfe0fffff);
+	void __iomem *l2x0_base = MMIO_P2V(CT_CA9X4_L2CC);
+	/* set RAM latencies to 1 cycle for this core tile. */
+	writel(0, l2x0_base + L2X0_TAG_LATENCY_CTRL);
+	writel(0, l2x0_base + L2X0_DATA_LATENCY_CTRL);
+	l2x0_init(l2x0_base, 0x00400000, 0xfe0fffff);
 #endif
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));

arch/arm/mm/alignment.c+17−2

@@ -885,8 +885,23 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) · 884 unmodified lines
885		885
886	if (ai_usermode & UM_SIGNAL)	886	if (ai_usermode & UM_SIGNAL)
887	force_sig(SIGBUS, current);	887	force_sig(SIGBUS, current);
888	else	888	else {
889	set_cr(cr_no_alignment);	889	/*
		890	* We're about to disable the alignment trap and return to
		891	* user space. But if an interrupt occurs before actually
		892	* reaching user space, then the IRQ vector entry code will
		893	* notice that we were still in kernel space and therefore
		894	* the alignment trap won't be re-enabled in that case as it
		895	* is presumed to be always on from kernel space.
		896	* Let's prevent that race by disabling interrupts here (they
		897	* are disabled on the way back to user space anyway in
		898	* entry-common.S) and disable the alignment trap only if
		899	* there is no work pending for this thread.
		900	*/
		901	raw_local_irq_disable();
		902	if (!(current_thread_info()->flags & _TIF_WORK_MASK))
		903	set_cr(cr_no_alignment);
		904	}
890		905
891	return 0;	906	return 0;
892	}	907	}

arch/arm/mm/mmu.c+29−2

@@ -15,6 +15,7 @@ · 14 unmodified lines
15	#include <linux/nodemask.h>	15	#include <linux/nodemask.h>
16	#include <linux/memblock.h>	16	#include <linux/memblock.h>
17	#include <linux/sort.h>	17	#include <linux/sort.h>
		18	#include <linux/fs.h>
18		19
19	#include <asm/cputype.h>	20	#include <asm/cputype.h>
20	#include <asm/sections.h>	21	#include <asm/sections.h>
@@ -246,6 +247,9 @@ static struct mem_type mem_types[] = { · 225 unmodified lines
246	.domain = DOMAIN_USER,	247	.domain = DOMAIN_USER,
247	},	248	},
248	[MT_MEMORY] = {	249	[MT_MEMORY] = {
		250	.prot_pte = L_PTE_PRESENT \| L_PTE_YOUNG \| L_PTE_DIRTY \|
		251	L_PTE_USER \| L_PTE_EXEC,
		252	.prot_l1 = PMD_TYPE_TABLE,
249	.prot_sect = PMD_TYPE_SECT \| PMD_SECT_AP_WRITE,	253	.prot_sect = PMD_TYPE_SECT \| PMD_SECT_AP_WRITE,
250	.domain = DOMAIN_KERNEL,	254	.domain = DOMAIN_KERNEL,
251	},	255	},
@@ -254,6 +258,9 @@ static struct mem_type mem_types[] = { · 2 unmodified lines
254	.domain = DOMAIN_KERNEL,	258	.domain = DOMAIN_KERNEL,
255	},	259	},
256	[MT_MEMORY_NONCACHED] = {	260	[MT_MEMORY_NONCACHED] = {
		261	.prot_pte = L_PTE_PRESENT \| L_PTE_YOUNG \| L_PTE_DIRTY \|
		262	L_PTE_USER \| L_PTE_EXEC \| L_PTE_MT_BUFFERABLE,
		263	.prot_l1 = PMD_TYPE_TABLE,
257	.prot_sect = PMD_TYPE_SECT \| PMD_SECT_AP_WRITE,	264	.prot_sect = PMD_TYPE_SECT \| PMD_SECT_AP_WRITE,
258	.domain = DOMAIN_KERNEL,	265	.domain = DOMAIN_KERNEL,
259	},	266	},
@@ -411,9 +418,12 @@ static void __init build_mem_type_table(void) · 151 unmodified lines
411	* Enable CPU-specific coherency if supported.	418	* Enable CPU-specific coherency if supported.
412	* (Only available on XSC3 at the moment.)	419	* (Only available on XSC3 at the moment.)
413	*/	420	*/
414	if (arch_is_coherent() && cpu_is_xsc3())	421	if (arch_is_coherent() && cpu_is_xsc3()) {
415	mem_types[MT_MEMORY].prot_sect \|= PMD_SECT_S;	422	mem_types[MT_MEMORY].prot_sect \|= PMD_SECT_S;
416		423	mem_types[MT_MEMORY].prot_pte \|= L_PTE_SHARED;
		424	mem_types[MT_MEMORY_NONCACHED].prot_sect \|= PMD_SECT_S;
		425	mem_types[MT_MEMORY_NONCACHED].prot_pte \|= L_PTE_SHARED;
		426	}
417	/*	427	/*
418	* ARMv6 and above have extended page tables.	428	* ARMv6 and above have extended page tables.
419	*/	429	*/
@@ -438,7 +448,9 @@ static void __init build_mem_type_table(void) · 18 unmodified lines
438	mem_types[MT_DEVICE_CACHED].prot_sect \|= PMD_SECT_S;	448	mem_types[MT_DEVICE_CACHED].prot_sect \|= PMD_SECT_S;
439	mem_types[MT_DEVICE_CACHED].prot_pte \|= L_PTE_SHARED;	449	mem_types[MT_DEVICE_CACHED].prot_pte \|= L_PTE_SHARED;
440	mem_types[MT_MEMORY].prot_sect \|= PMD_SECT_S;	450	mem_types[MT_MEMORY].prot_sect \|= PMD_SECT_S;
		451	mem_types[MT_MEMORY].prot_pte \|= L_PTE_SHARED;
441	mem_types[MT_MEMORY_NONCACHED].prot_sect \|= PMD_SECT_S;	452	mem_types[MT_MEMORY_NONCACHED].prot_sect \|= PMD_SECT_S;
		453	mem_types[MT_MEMORY_NONCACHED].prot_pte \|= L_PTE_SHARED;
442	#endif	454	#endif
443	}	455	}
444		456
@@ -475,6 +487,8 @@ static void __init build_mem_type_table(void) · 30 unmodified lines
475	mem_types[MT_LOW_VECTORS].prot_l1 \|= ecc_mask;	487	mem_types[MT_LOW_VECTORS].prot_l1 \|= ecc_mask;
476	mem_types[MT_HIGH_VECTORS].prot_l1 \|= ecc_mask;	488	mem_types[MT_HIGH_VECTORS].prot_l1 \|= ecc_mask;
477	mem_types[MT_MEMORY].prot_sect \|= ecc_mask \| cp->pmd;	489	mem_types[MT_MEMORY].prot_sect \|= ecc_mask \| cp->pmd;
		490	mem_types[MT_MEMORY].prot_pte \|= kern_pgprot;
		491	mem_types[MT_MEMORY_NONCACHED].prot_sect \|= ecc_mask;
478	mem_types[MT_ROM].prot_sect \|= cp->pmd;	492	mem_types[MT_ROM].prot_sect \|= cp->pmd;
479		493
480	switch (cp->pmd) {	494	switch (cp->pmd) {
@@ -498,6 +512,19 @@ static void __init build_mem_type_table(void) · 17 unmodified lines
498	}	512	}
499	}	513	}
500		514
		515	#ifdef CONFIG_ARM_DMA_MEM_BUFFERABLE
		516	pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
		517	unsigned long size, pgprot_t vma_prot)
		518	{
		519	if (!pfn_valid(pfn))
		520	return pgprot_noncached(vma_prot);
		521	else if (file->f_flags & O_SYNC)
		522	return pgprot_writecombine(vma_prot);
		523	return vma_prot;
		524	}
		525	EXPORT_SYMBOL(phys_mem_access_prot);
		526	#endif
		527
501	#define vectors_base() (vectors_high() ? 0xffff0000 : 0)	528	#define vectors_base() (vectors_high() ? 0xffff0000 : 0)
502		529
503	static void __init *early_alloc(unsigned long sz)	530	static void __init *early_alloc(unsigned long sz)

arch/arm/mm/proc-v7.S+56−6

  *	It is assumed that:
  *	- cache type register is implemented
  */
-__v7_setup:
+__v7_ca9mp_setup:
 #ifdef CONFIG_SMP
 	mrc	p15, 0, r0, c1, c0, 1
 	tst	r0, #(1 << 6)			@ SMP/nAMP mode enabled?
 	orreq	r0, r0, #(1 << 6) | (1 << 0)	@ Enable SMP/nAMP mode and
 	mcreq	p15, 0, r0, c1, c0, 1		@ TLB ops broadcasting
 #endif
+__v7_setup:
 	adr	r12, __v7_setup_stack		@ the local stack
 	stmia	r12, {r0-r5, r7, r9, r11, lr}
 	bl	v7_flush_dcache_all
 	mrc	p15, 0, r0, c0, c0, 0		@ read main ID register
 	and	r10, r0, #0xff000000		@ ARM?
 	teq	r10, #0x41000000
-	bne	2f
+	bne	3f
 	and	r5, r0, #0x00f00000		@ variant
 	and	r6, r0, #0x0000000f		@ revision
-	orr	r0, r6, r5, lsr #20-4		@ combine variant and revision
+	orr	r6, r6, r5, lsr #20-4		@ combine variant and revision
+	ubfx	r0, r0, #4, #12			@ primary part number
+	/* Cortex-A8 Errata */
+	ldr	r10, =0x00000c08		@ Cortex-A8 primary part number
+	teq	r0, r10
+	bne	2f
 #ifdef CONFIG_ARM_ERRATA_430973
 	teq	r5, #0x00100000			@ only present in r1p*
 	mrceq	p15, 0, r10, c1, c0, 1		@ read aux control register
 	mcreq	p15, 0, r10, c1, c0, 1		@ write aux control register
 #endif
 #ifdef CONFIG_ARM_ERRATA_458693
-	teq	r0, #0x20			@ only present in r2p0
+	teq	r6, #0x20			@ only present in r2p0
 	mrceq	p15, 0, r10, c1, c0, 1		@ read aux control register
 	orreq	r10, r10, #(1 << 5)		@ set L1NEON to 1
 	orreq	r10, r10, #(1 << 9)		@ set PLDNOP to 1
 	mcreq	p15, 0, r10, c1, c0, 1		@ write aux control register
 #endif
 #ifdef CONFIG_ARM_ERRATA_460075
-	teq	r0, #0x20			@ only present in r2p0
+	teq	r6, #0x20			@ only present in r2p0
 	mrceq	p15, 1, r10, c9, c0, 2		@ read L2 cache aux ctrl register
 	tsteq	r10, #1 << 22
 	orreq	r10, r10, #(1 << 22)		@ set the Write Allocate disable bit
 	mcreq	p15, 1, r10, c9, c0, 2		@ write the L2 cache aux ctrl register
 #endif
+	b	3f
+	/* Cortex-A9 Errata */
+2:	ldr	r10, =0x00000c09		@ Cortex-A9 primary part number
+	teq	r0, r10
+	bne	3f
+#ifdef CONFIG_ARM_ERRATA_742230
+	cmp	r6, #0x22			@ only present up to r2p2
+	mrcle	p15, 0, r10, c15, c0, 1		@ read diagnostic register
+	orrle	r10, r10, #1 << 4		@ set bit #4
+	mcrle	p15, 0, r10, c15, c0, 1		@ write diagnostic register
+#endif
+#ifdef CONFIG_ARM_ERRATA_742231
+	teq	r6, #0x20			@ present in r2p0
+	teqne	r6, #0x21			@ present in r2p1
+	teqne	r6, #0x22			@ present in r2p2
+	mrceq	p15, 0, r10, c15, c0, 1		@ read diagnostic register
+	orreq	r10, r10, #1 << 12		@ set bit #12
+	orreq	r10, r10, #1 << 22		@ set bit #22
+	mcreq	p15, 0, r10, c15, c0, 1		@ write diagnostic register
+#endif
-2:	mov	r10, #0
+3:	mov	r10, #0
 #ifdef HARVARD_CACHE
 	mcr	p15, 0, r10, c7, c5, 0		@ I+BTB cache invalidate
 #endif
 	.section ".proc.info.init", #alloc, #execinstr
+	.type   __v7_ca9mp_proc_info, #object
+__v7_ca9mp_proc_info:
+	.long	0x410fc090		@ Required ID value
+	.long	0xff0ffff0		@ Mask for ID
+	.long   PMD_TYPE_SECT | \
+		PMD_SECT_AP_WRITE | \
+		PMD_SECT_AP_READ | \
+		PMD_FLAGS
+	.long   PMD_TYPE_SECT | \
+		PMD_SECT_XN | \
+		PMD_SECT_AP_WRITE | \
+		PMD_SECT_AP_READ
+	b	__v7_ca9mp_setup
+	.long	cpu_arch_name
+	.long	cpu_elf_name
+	.long	HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
+	.long	cpu_v7_name
+	.long	v7_processor_functions
+	.long	v7wbi_tlb_fns
+	.long	v6_user_fns
+	.long	v7_cache_fns
+	.size	__v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info
 	/*
 	 * Match any ARMv7 processor core.
 	 */

arch/arm/plat-nomadik/timer.c+12−21

@@ -1,5 +1,5 @@
1	/*	1	/*
2	* linux/arch/arm/mach-nomadik/timer.c	2	* linux/arch/arm/plat-nomadik/timer.c
3	*	3	*
4	* Copyright (C) 2008 STMicroelectronics	4	* Copyright (C) 2008 STMicroelectronics
5	* Copyright (C) 2010 Alessandro Rubini	5	* Copyright (C) 2010 Alessandro Rubini
@@ -75,7 +75,7 @@ static void nmdk_clkevt_mode(enum clock_event_mode mode, · 69 unmodified lines
75	cr = readl(mtu_base + MTU_CR(1));	75	cr = readl(mtu_base + MTU_CR(1));
76	writel(0, mtu_base + MTU_LR(1));	76	writel(0, mtu_base + MTU_LR(1));
77	writel(cr \| MTU_CRn_ENA, mtu_base + MTU_CR(1));	77	writel(cr \| MTU_CRn_ENA, mtu_base + MTU_CR(1));
78	writel(0x2, mtu_base + MTU_IMSC);	78	writel(1 << 1, mtu_base + MTU_IMSC);
79	break;	79	break;
80	case CLOCK_EVT_MODE_SHUTDOWN:	80	case CLOCK_EVT_MODE_SHUTDOWN:
81	case CLOCK_EVT_MODE_UNUSED:	81	case CLOCK_EVT_MODE_UNUSED:
@@ -131,25 +131,23 @@ void __init nmdk_timer_init(void) · 49 unmodified lines
131	{	131	{
132	unsigned long rate;	132	unsigned long rate;
133	struct clk *clk0;	133	struct clk *clk0;
134	struct clk *clk1;	134	u32 cr = MTU_CRn_32BITS;
135	u32 cr;
136		135
137	clk0 = clk_get_sys("mtu0", NULL);	136	clk0 = clk_get_sys("mtu0", NULL);
138	BUG_ON(IS_ERR(clk0));	137	BUG_ON(IS_ERR(clk0));
139		138
140	clk1 = clk_get_sys("mtu1", NULL);
141	BUG_ON(IS_ERR(clk1));
142
143	clk_enable(clk0);	139	clk_enable(clk0);
144	clk_enable(clk1);
145		140
146	/*	141	/*
147	* Tick rate is 2.4MHz for Nomadik and 110MHz for ux500:	142	* Tick rate is 2.4MHz for Nomadik and 2.4Mhz, 100MHz or 133 MHz
148	* use a divide-by-16 counter if it's more than 16MHz	143	* for ux500.
		144	* Use a divide-by-16 counter if the tick rate is more than 32MHz.
		145	* At 32 MHz, the timer (with 32 bit counter) can be programmed
		146	* to wake-up at a max 127s a head in time. Dividing a 2.4 MHz timer
		147	* with 16 gives too low timer resolution.
149	*/	148	*/
150	cr = MTU_CRn_32BITS;;
151	rate = clk_get_rate(clk0);	149	rate = clk_get_rate(clk0);
152	if (rate > 16 << 20) {	150	if (rate > 32000000) {
153	rate /= 16;	151	rate /= 16;
154	cr \|= MTU_CRn_PRESCALE_16;	152	cr \|= MTU_CRn_PRESCALE_16;
155	} else {	153	} else {
@@ -170,15 +168,8 @@ void __init nmdk_timer_init(void) · 14 unmodified lines
170	pr_err("timer: failed to initialize clock source %s\n",	168	pr_err("timer: failed to initialize clock source %s\n",
171	nmdk_clksrc.name);	169	nmdk_clksrc.name);
172		170
173	/* Timer 1 is used for events, fix according to rate */	171	/* Timer 1 is used for events */
174	cr = MTU_CRn_32BITS;	172
175	rate = clk_get_rate(clk1);
176	if (rate > 16 << 20) {
177	rate /= 16;
178	cr \|= MTU_CRn_PRESCALE_16;
179	} else {
180	cr \|= MTU_CRn_PRESCALE_1;
181	}
182	clockevents_calc_mult_shift(&nmdk_clkevt, rate, MTU_MIN_RANGE);	173	clockevents_calc_mult_shift(&nmdk_clkevt, rate, MTU_MIN_RANGE);
183		174
184	writel(cr \| MTU_CRn_ONESHOT, mtu_base + MTU_CR(1)); /* off, currently */	175	writel(cr \| MTU_CRn_ONESHOT, mtu_base + MTU_CR(1)); /* off, currently */

arch/arm/plat-omap/Kconfig+1−1

@@ -33,7 +33,7 @@ config OMAP_DEBUG_DEVICES · 32 unmodified lines
33	config OMAP_DEBUG_LEDS	33	config OMAP_DEBUG_LEDS
34	bool	34	bool
35	depends on OMAP_DEBUG_DEVICES	35	depends on OMAP_DEBUG_DEVICES
36	default y if LEDS	36	default y if LEDS_CLASS
37		37
38	config OMAP_RESET_CLOCKS	38	config OMAP_RESET_CLOCKS
39	bool "Reset unused clocks during boot"	39	bool "Reset unused clocks during boot"

arch/arm/plat-omap/mcbsp.c+1−1

@@ -156,7 +156,7 @@ static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id) · 155 unmodified lines
156	/* Writing zero to RSYNC_ERR clears the IRQ */	156	/* Writing zero to RSYNC_ERR clears the IRQ */
157	MCBSP_WRITE(mcbsp_rx, SPCR1, MCBSP_READ_CACHE(mcbsp_rx, SPCR1));	157	MCBSP_WRITE(mcbsp_rx, SPCR1, MCBSP_READ_CACHE(mcbsp_rx, SPCR1));
158	} else {	158	} else {
159	complete(&mcbsp_rx->tx_irq_completion);	159	complete(&mcbsp_rx->rx_irq_completion);
160	}	160	}
161		161
162	return IRQ_HANDLED;	162	return IRQ_HANDLED;

arch/arm/plat-omap/sram.c+5−20

 	if (omap_sram_size == 0)
 		return;
-	if (cpu_is_omap24xx()) {
-		omap_sram_io_desc[0].virtual = OMAP2_SRAM_VA;
-		base = OMAP2_SRAM_PA;
-		base = ROUND_DOWN(base, PAGE_SIZE);
-		omap_sram_io_desc[0].pfn = __phys_to_pfn(base);
-	}
 	if (cpu_is_omap34xx()) {
-		omap_sram_io_desc[0].virtual = OMAP3_SRAM_VA;
-		base = OMAP3_SRAM_PA;
-		base = ROUND_DOWN(base, PAGE_SIZE);
-		omap_sram_io_desc[0].pfn = __phys_to_pfn(base);
 		/*
 		 * SRAM must be marked as non-cached on OMAP3 since the
 		 * CORE DPLL M2 divider change code (in SRAM) runs with the
 		omap_sram_io_desc[0].type = MT_MEMORY_NONCACHED;
 	}
-	if (cpu_is_omap44xx()) {
+	omap_sram_io_desc[0].virtual = omap_sram_base;
-		omap_sram_io_desc[0].virtual = OMAP4_SRAM_VA;
+	base = omap_sram_start;
-		base = OMAP4_SRAM_PA;
+	base = ROUND_DOWN(base, PAGE_SIZE);
-		base = ROUND_DOWN(base, PAGE_SIZE);
+	omap_sram_io_desc[0].pfn = __phys_to_pfn(base);
-		omap_sram_io_desc[0].pfn = __phys_to_pfn(base);
+	omap_sram_io_desc[0].length = ROUND_DOWN(omap_sram_size, PAGE_SIZE);
-	}
-	omap_sram_io_desc[0].length = 1024 * 1024;	/* Use section desc */
 	iotable_init(omap_sram_io_desc, ARRAY_SIZE(omap_sram_io_desc));
 	printk(KERN_INFO "SRAM: Mapped pa 0x%08lx to va 0x%08lx size: 0x%lx\n",

arch/avr32/kernel/module.c+1−2

 	vfree(module->arch.syminfo);
 	module->arch.syminfo = NULL;
-	return module_bug_finalize(hdr, sechdrs, module);
+	return 0;
 }
 void module_arch_cleanup(struct module *module)
 {
-	module_bug_cleanup(module);
 }

arch/h8300/kernel/module.c+1−2

 		    const Elf_Shdr *sechdrs,
 		    struct module *me)
 {
-	return module_bug_finalize(hdr, sechdrs, me);
+	return 0;
 }
 void module_arch_cleanup(struct module *mod)
 {
-	module_bug_cleanup(mod);
 }

arch/m32r/include/asm/signal.h+0−1

@@ -157,7 +157,6 @@ typedef struct sigaltstack { · 156 unmodified lines
157	#undef __HAVE_ARCH_SIG_BITOPS	157	#undef __HAVE_ARCH_SIG_BITOPS
158		158
159	struct pt_regs;	159	struct pt_regs;
160	extern int do_signal(struct pt_regs regs, sigset_t oldset);
161		160
162	#define ptrace_signal_deliver(regs, cookie) do { } while (0)	161	#define ptrace_signal_deliver(regs, cookie) do { } while (0)
163		162

arch/m32r/include/asm/unistd.h+1−0

@@ -351,6 +351,7 @@ · 350 unmodified lines
351	#define __ARCH_WANT_SYS_OLD_GETRLIMIT /will be unused/	351	#define __ARCH_WANT_SYS_OLD_GETRLIMIT /will be unused/
352	#define __ARCH_WANT_SYS_OLDUMOUNT	352	#define __ARCH_WANT_SYS_OLDUMOUNT
353	#define __ARCH_WANT_SYS_RT_SIGACTION	353	#define __ARCH_WANT_SYS_RT_SIGACTION
		354	#define __ARCH_WANT_SYS_RT_SIGSUSPEND
354		355
355	#define __IGNORE_lchown	356	#define __IGNORE_lchown
356	#define __IGNORE_setuid	357	#define __IGNORE_setuid

arch/m32r/kernel/entry.S+2−3

 work_notifysig:				; deal with pending signals and
 					; notify-resume requests
 	mv	r0, sp			; arg1 : struct pt_regs *regs
-	ldi	r1, #0			; arg2 : sigset_t *oldset
+	mv	r1, r9			; arg2 : __u32 thread_info_flags
-	mv	r2, r9			; arg3 : __u32 thread_info_flags
 	bl	do_notify_resume
-	bra	restore_all
+	bra	resume_userspace
 	; perform syscall exit tracing
 	ALIGN

arch/m32r/kernel/ptrace.c+4−3

 	if (access_process_vm(child, pc&~3, &insn, sizeof(insn), 0)
 	    != sizeof(insn))
-		break;
+		return -EIO;
 	compute_next_pc(insn, pc, &next_pc, child);
 	if (next_pc & 0x80000000)
-		break;
+		return -EIO;
 	if (embed_debug_trap(child, next_pc))
-		break;
+		return -EIO;
 	invalidate_cache();
+	return 0;
 }
 void user_disable_single_step(struct task_struct *child)

arch/m32r/kernel/signal.c+41−64

 #define DEBUG_SIG 0
-#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
-int do_signal(struct pt_regs *, sigset_t *);
-asmlinkage int
-sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize,
-		  unsigned long r2, unsigned long r3, unsigned long r4,
-		  unsigned long r5, unsigned long r6, struct pt_regs *regs)
-{
-	sigset_t newset;
-	/* XXX: Don't preclude handling different sized sigset_t's.  */
-	if (sigsetsize != sizeof(sigset_t))
-		return -EINVAL;
-	if (copy_from_user(&newset, unewset, sizeof(newset)))
-		return -EFAULT;
-	sigdelsetmask(&newset, sigmask(SIGKILL)|sigmask(SIGSTOP));
-	spin_lock_irq(&current->sighand->siglock);
-	current->saved_sigmask = current->blocked;
-	current->blocked = newset;
-	recalc_sigpending();
-	spin_unlock_irq(&current->sighand->siglock);
-	current->state = TASK_INTERRUPTIBLE;
-	schedule();
-	set_thread_flag(TIF_RESTORE_SIGMASK);
-	return -ERESTARTNOHAND;
-}
 asmlinkage int
 sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
 		unsigned long r2, unsigned long r3, unsigned long r4,
 	return (void __user *)((sp - frame_size) & -8ul);
 }
-static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
+static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 			   sigset_t *set, struct pt_regs *regs)
 {
 	struct rt_sigframe __user *frame;
 		current->comm, current->pid, frame, regs->pc);
 #endif
-	return;
+	return 0;
 give_sigsegv:
 	force_sigsegv(sig, current);
+	return -EFAULT;
+}
+static int prev_insn(struct pt_regs *regs)
+{
+	u16 inst;
+	if (get_user(&inst, (u16 __user *)(regs->bpc - 2)))
+		return -EFAULT;
+	if ((inst & 0xfff0) == 0x10f0)	/* trap ? */
+		regs->bpc -= 2;
+	else
+		regs->bpc -= 4;
+	regs->syscall_nr = -1;
+	return 0;
 }
 /*
  * OK, we're invoking a handler
  */
-static void
+static int
 handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
 	      sigset_t *oldset, struct pt_regs *regs)
 {
-	unsigned short inst;
 	/* Are we from a system call? */
 	if (regs->syscall_nr >= 0) {
 		/* If so, check system call restarting.. */
 			/* fallthrough */
 			case -ERESTARTNOINTR:
 				regs->r0 = regs->orig_r0;
-				inst = *(unsigned short *)(regs->bpc - 2);
+				if (prev_insn(regs) < 0)
-				if ((inst & 0xfff0) == 0x10f0)	/* trap ? */
+					return -EFAULT;
-					regs->bpc -= 2;
-				else
-					regs->bpc -= 4;
 		}
 	}
 	/* Set up the stack frame */
-	setup_rt_frame(sig, ka, info, oldset, regs);
+	if (setup_rt_frame(sig, ka, info, oldset, regs))
+		return -EFAULT;
 	spin_lock_irq(&current->sighand->siglock);
 	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
 		sigaddset(&current->blocked,sig);
 	recalc_sigpending();
 	spin_unlock_irq(&current->sighand->siglock);
+	return 0;
 }
 /*
  * want to handle. Thus you cannot kill init even with a SIGKILL even by
  * mistake.
  */
-int do_signal(struct pt_regs *regs, sigset_t *oldset)
+static void do_signal(struct pt_regs *regs)
 {
 	siginfo_t info;
 	int signr;
 	struct k_sigaction ka;
-	unsigned short inst;
+	sigset_t *oldset;
 	/*
 	 * We want the common case to go fast, which
 	 * if so.
 	 */
 	if (!user_mode(regs))
-		return 1;
+		return;
 	if (try_to_freeze())
 		goto no_signal;
-	if (!oldset)
+	if (test_thread_flag(TIF_RESTORE_SIGMASK))
+		oldset = &current->saved_sigmask;
+	else
 		oldset = &current->blocked;
 	signr = get_signal_to_deliver(&info, &ka, regs, NULL);
 		 */
 		/* Whee!  Actually deliver the signal.  */
-		handle_signal(signr, &ka, &info, oldset, regs);
+		if (handle_signal(signr, &ka, &info, oldset, regs) == 0)
-		return 1;
+			clear_thread_flag(TIF_RESTORE_SIGMASK);
+		return;
 	}
  no_signal:
 		    regs->r0 == -ERESTARTSYS ||
 		    regs->r0 == -ERESTARTNOINTR) {
 			regs->r0 = regs->orig_r0;
-			inst = *(unsigned short *)(regs->bpc - 2);
+			prev_insn(regs);
-			if ((inst & 0xfff0) == 0x10f0)	/* trap ? */
+		} else if (regs->r0 == -ERESTART_RESTARTBLOCK){
-				regs->bpc -= 2;
-			else
-				regs->bpc -= 4;
-		}
-		if (regs->r0 == -ERESTART_RESTARTBLOCK){
 			regs->r0 = regs->orig_r0;
 			regs->r7 = __NR_restart_syscall;
-			inst = *(unsigned short *)(regs->bpc - 2);
+			prev_insn(regs);
-			if ((inst & 0xfff0) == 0x10f0)	/* trap ? */
-				regs->bpc -= 2;
-			else
-				regs->bpc -= 4;
 		}
 	}
-	return 0;
+	if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
+		clear_thread_flag(TIF_RESTORE_SIGMASK);
+		sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
+	}
 }
 /*
  * notification of userspace execution resumption
  * - triggered by current->work.notify_resume
  */
-void do_notify_resume(struct pt_regs *regs, sigset_t *oldset,
+void do_notify_resume(struct pt_regs *regs, __u32 thread_info_flags)
-		      __u32 thread_info_flags)
 {
 	/* Pending single-step? */
 	if (thread_info_flags & _TIF_SINGLESTEP)
 	/* deal with pending signal delivery */
 	if (thread_info_flags & _TIF_SIGPENDING)
-		do_signal(regs,oldset);
+		do_signal(regs);
 	if (thread_info_flags & _TIF_NOTIFY_RESUME) {
 		clear_thread_flag(TIF_NOTIFY_RESUME);

arch/m68k/mac/macboing.c+3−3

@@ -162,7 +162,7 @@ static void mac_init_asc( void ) · 161 unmodified lines
162	void mac_mksound( unsigned int freq, unsigned int length )	162	void mac_mksound( unsigned int freq, unsigned int length )
163	{	163	{
164	__u32 cfreq = ( freq << 5 ) / 468;	164	__u32 cfreq = ( freq << 5 ) / 468;
165	__u32 flags;	165	unsigned long flags;
166	int i;	166	int i;
167		167
168	if ( mac_special_bell == NULL )	168	if ( mac_special_bell == NULL )
@@ -224,7 +224,7 @@ static void mac_nosound( unsigned long ignored ) · 55 unmodified lines
224	*/	224	*/
225	static void mac_quadra_start_bell( unsigned int freq, unsigned int length, unsigned int volume )	225	static void mac_quadra_start_bell( unsigned int freq, unsigned int length, unsigned int volume )
226	{	226	{
227	__u32 flags;	227	unsigned long flags;
228		228
229	/* if the bell is already ringing, ring longer */	229	/* if the bell is already ringing, ring longer */
230	if ( mac_bell_duration > 0 )	230	if ( mac_bell_duration > 0 )
@@ -271,7 +271,7 @@ static void mac_quadra_start_bell( unsigned int freq, unsigned int length, unsig · 40 unmodified lines
271	static void mac_quadra_ring_bell( unsigned long ignored )	271	static void mac_quadra_ring_bell( unsigned long ignored )
272	{	272	{
273	int i, count = mac_asc_samplespersec / HZ;	273	int i, count = mac_asc_samplespersec / HZ;
274	__u32 flags;	274	unsigned long flags;
275		275
276	/*	276	/*
277	* we neither want a sound buffer overflow nor underflow, so we need to match	277	* we neither want a sound buffer overflow nor underflow, so we need to match

arch/mips/Kconfig+19−2

 	select HAVE_KPROBES
 	select HAVE_KRETPROBES
 	select RTC_LIB if !MACH_LOONGSON
+	select GENERIC_ATOMIC64 if !64BIT
 mainmenu "Linux/MIPS Kernel Configuration"
 	select SYS_SUPPORTS_SMP
 	select SMP_UP
 	help
-	  This is a kernel model which is also known a VSMP or lately
+	  This is a kernel model which is known a VSMP but lately has been
-	  has been marketesed into SMVP.
+	  marketesed into SMVP.
+	  Virtual SMP uses the processor's VPEs  to implement virtual
+	  processors. In currently available configuration of the 34K processor
+	  this allows for a dual processor. Both processors will share the same
+	  primary caches; each will obtain the half of the TLB for it's own
+	  exclusive use. For a layman this model can be described as similar to
+	  what Intel calls Hyperthreading.
+	  For further information see http://www.linux-mips.org/wiki/34K#VSMP
 config MIPS_MT_SMTC
 	bool "SMTC: Use all TCs on all VPEs for SMP"
 	help
 	  This is a kernel model which is known a SMTC or lately has been
 	  marketesed into SMVP.
+	  is presenting the available TC's of the core as processors to Linux.
+	  On currently available 34K processors this means a Linux system will
+	  see up to 5 processors. The implementation of the SMTC kernel differs
+	  significantly from VSMP and cannot efficiently coexist in the same
+	  kernel binary so the choice between VSMP and SMTC is a compile time
+	  decision.
+	  For further information see http://www.linux-mips.org/wiki/34K#SMTC
 endchoice

arch/mips/alchemy/common/prom.c+2−3

 char **prom_argv;
 char **prom_envp;
-void prom_init_cmdline(void)
+void __init prom_init_cmdline(void)
 {
 	int i;
 	}
 }
-int prom_get_ethernet_addr(char *ethernet_addr)
+int __init prom_get_ethernet_addr(char *ethernet_addr)
 {
 	char *ethaddr_str;
 	return 0;
 }
-EXPORT_SYMBOL(prom_get_ethernet_addr);
 void __init prom_free_prom_memory(void)
 {

arch/mips/boot/compressed/Makefile+1−1

@@ -59,7 +59,7 @@ $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE · 58 unmodified lines
59	hostprogs-y := calc_vmlinuz_load_addr	59	hostprogs-y := calc_vmlinuz_load_addr
60		60
61	VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \	61	VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \
62	$(objtree)/$(KBUILD_IMAGE) $(VMLINUX_LOAD_ADDRESS))	62	$(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS))
63		63
64	vmlinuzobjs-y += $(obj)/piggy.o	64	vmlinuzobjs-y += $(obj)/piggy.o
65		65

arch/mips/cavium-octeon/Kconfig+4−0

@@ -83,3 +83,7 @@ config ARCH_SPARSEMEM_ENABLE · 82 unmodified lines
83	def_bool y	83	def_bool y
84	select SPARSEMEM_STATIC	84	select SPARSEMEM_STATIC
85	depends on CPU_CAVIUM_OCTEON	85	depends on CPU_CAVIUM_OCTEON
		86
		87	config CAVIUM_OCTEON_HELPER
		88	def_bool y
		89	depends on OCTEON_ETHERNET \|\| PCI

arch/mips/cavium-octeon/cpu.c+1−1

@@ -41,7 +41,7 @@ static int cnmips_cu2_call(struct notifier_block *nfb, unsigned long action, · 40 unmodified lines
41	return NOTIFY_OK; /* Let default notifier send signals */	41	return NOTIFY_OK; /* Let default notifier send signals */
42	}	42	}
43		43
44	static int cnmips_cu2_setup(void)	44	static int __init cnmips_cu2_setup(void)
45	{	45	{
46	return cu2_notifier(cnmips_cu2_call, 0);	46	return cu2_notifier(cnmips_cu2_call, 0);
47	}	47	}

arch/mips/cavium-octeon/executive/Makefile+1−1

@@ -11,4 +11,4 @@ · 10 unmodified lines
11		11
12	obj-y += cvmx-bootmem.o cvmx-l2c.o cvmx-sysinfo.o octeon-model.o	12	obj-y += cvmx-bootmem.o cvmx-l2c.o cvmx-sysinfo.o octeon-model.o
13		13
14	obj-$(CONFIG_PCI) += cvmx-helper-errata.o cvmx-helper-jtag.o	14	obj-$(CONFIG_CAVIUM_OCTEON_HELPER) += cvmx-helper-errata.o cvmx-helper-jtag.o

arch/mips/include/asm/atomic.h+4−0

@@ -782,6 +782,10 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) · 781 unmodified lines
782	*/	782	*/
783	#define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0)	783	#define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0)
784		784
		785	#else /* !CONFIG_64BIT */
		786
		787	#include <asm-generic/atomic64.h>
		788
785	#endif /* CONFIG_64BIT */	789	#endif /* CONFIG_64BIT */
786		790
787	/*	791	/*

arch/mips/include/asm/cop2.h+1−1

@@ -24,7 +24,7 @@ extern int cu2_notifier_call_chain(unsigned long val, void *v); · 23 unmodified lines
24		24
25	#define cu2_notifier(fn, pri) \	25	#define cu2_notifier(fn, pri) \
26	({ \	26	({ \
27	static struct notifier_block fn##_nb __cpuinitdata = { \	27	static struct notifier_block fn##_nb = { \
28	.notifier_call = fn, \	28	.notifier_call = fn, \
29	.priority = pri \	29	.priority = pri \
30	}; \	30	}; \

arch/mips/include/asm/gic.h+1−0

@@ -321,6 +321,7 @@ struct gic_intrmask_regs { · 320 unmodified lines
321	*/	321	*/
322	struct gic_intr_map {	322	struct gic_intr_map {
323	unsigned int cpunum; /* Directed to this CPU */	323	unsigned int cpunum; /* Directed to this CPU */
		324	#define GIC_UNUSED 0xdead /* Dummy data */
324	unsigned int pin; /* Directed to this Pin */	325	unsigned int pin; /* Directed to this Pin */
325	unsigned int polarity; /* Polarity : +/- */	326	unsigned int polarity; /* Polarity : +/- */
326	unsigned int trigtype; /* Trigger : Edge/Levl */	327	unsigned int trigtype; /* Trigger : Edge/Levl */

arch/mips/include/asm/mach-tx49xx/kmalloc.h+1−1

@@ -1,6 +1,6 @@
1	#ifndef __ASM_MACH_TX49XX_KMALLOC_H	1	#ifndef __ASM_MACH_TX49XX_KMALLOC_H
2	#define __ASM_MACH_TX49XX_KMALLOC_H	2	#define __ASM_MACH_TX49XX_KMALLOC_H
3		3
4	#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES	4	#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5		5
6	#endif /* __ASM_MACH_TX49XX_KMALLOC_H */	6	#endif /* __ASM_MACH_TX49XX_KMALLOC_H */

arch/mips/include/asm/mips-boards/maltaint.h+0−3

@@ -88,9 +88,6 @@ · 87 unmodified lines
88		88
89	#define GIC_EXT_INTR(x) x	89	#define GIC_EXT_INTR(x) x
90		90
91	/* Dummy data */
92	#define X 0xdead
93
94	/* External Interrupts used for IPI */	91	/* External Interrupts used for IPI */
95	#define GIC_IPI_EXT_INTR_RESCHED_VPE0 16	92	#define GIC_IPI_EXT_INTR_RESCHED_VPE0 16
96	#define GIC_IPI_EXT_INTR_CALLFNC_VPE0 17	93	#define GIC_IPI_EXT_INTR_CALLFNC_VPE0 17

arch/mips/include/asm/page.h+14−0

@@ -150,6 +150,20 @@ typedef struct { unsigned long pgprot; } pgprot_t; · 149 unmodified lines
150	((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET)	150	((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET)
151	#endif	151	#endif
152	#define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET - PHYS_OFFSET))	152	#define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET - PHYS_OFFSET))
		153
		154	/*
		155	* RELOC_HIDE was originally added by 6007b903dfe5f1d13e0c711ac2894bdd4a61b1ad
		156	* (lmo) rsp. 8431fd094d625b94d364fe393076ccef88e6ce18 (kernel.org). The
		157	* discussion can be found in lkml posting
		158	* <a2ebde260608230500o3407b108hc03debb9da6e62c@mail.gmail.com> which is
		159	* archived at http://lists.linuxcoding.com/kernel/2006-q3/msg17360.html
		160	*
		161	* It is unclear if the misscompilations mentioned in
		162	* http://lkml.org/lkml/2010/8/8/138 also affect MIPS so we keep this one
		163	* until GCC 3.x has been retired before we can apply
		164	* https://patchwork.linux-mips.org/patch/1541/
		165	*/
		166
153	#define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x), 0))	167	#define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x), 0))
154		168
155	#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)	169	#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)

arch/mips/include/asm/thread_info.h+2−1

@@ -146,7 +146,8 @@ register struct thread_info *__current_thread_info __asm__("$28"); · 145 unmodified lines
146	#define _TIF_LOAD_WATCH (1<<TIF_LOAD_WATCH)	146	#define _TIF_LOAD_WATCH (1<<TIF_LOAD_WATCH)
147		147
148	/* work to do on interrupt/exception return */	148	/* work to do on interrupt/exception return */
149	#define _TIF_WORK_MASK (0x0000ffef & ~_TIF_SECCOMP)	149	#define _TIF_WORK_MASK (0x0000ffef & \
		150	~(_TIF_SECCOMP \| _TIF_SYSCALL_AUDIT))
150	/* work to do on any return to u-space */	151	/* work to do on any return to u-space */
151	#define _TIF_ALLWORK_MASK (0x8000ffff & ~_TIF_SECCOMP)	152	#define _TIF_ALLWORK_MASK (0x8000ffff & ~_TIF_SECCOMP)
152		153

arch/mips/include/asm/unistd.h+15−6

 #define __NR_perf_event_open		(__NR_Linux + 333)
 #define __NR_accept4			(__NR_Linux + 334)
 #define __NR_recvmmsg			(__NR_Linux + 335)
+#define __NR_fanotify_init		(__NR_Linux + 336)
+#define __NR_fanotify_mark		(__NR_Linux + 337)
+#define __NR_prlimit64			(__NR_Linux + 338)
 /*
  * Offset of the last Linux o32 flavoured syscall
  */
-#define __NR_Linux_syscalls		335
+#define __NR_Linux_syscalls		338
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
 #define __NR_O32_Linux			4000
-#define __NR_O32_Linux_syscalls		335
+#define __NR_O32_Linux_syscalls		338
 #if _MIPS_SIM == _MIPS_SIM_ABI64
 #define __NR_perf_event_open		(__NR_Linux + 292)
 #define __NR_accept4			(__NR_Linux + 293)
 #define __NR_recvmmsg			(__NR_Linux + 294)
+#define __NR_fanotify_init		(__NR_Linux + 295)
+#define __NR_fanotify_mark		(__NR_Linux + 296)
+#define __NR_prlimit64			(__NR_Linux + 297)
 /*
  * Offset of the last Linux 64-bit flavoured syscall
  */
-#define __NR_Linux_syscalls		294
+#define __NR_Linux_syscalls		297
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
 #define __NR_64_Linux			5000
-#define __NR_64_Linux_syscalls		294
+#define __NR_64_Linux_syscalls		297
 #if _MIPS_SIM == _MIPS_SIM_NABI32
 #define __NR_accept4			(__NR_Linux + 297)
 #define __NR_recvmmsg			(__NR_Linux + 298)
 #define __NR_getdents64			(__NR_Linux + 299)
+#define __NR_fanotify_init		(__NR_Linux + 300)
+#define __NR_fanotify_mark		(__NR_Linux + 301)
+#define __NR_prlimit64			(__NR_Linux + 302)
 /*
  * Offset of the last N32 flavoured syscall
  */
-#define __NR_Linux_syscalls		299
+#define __NR_Linux_syscalls		302
 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
 #define __NR_N32_Linux			6000
-#define __NR_N32_Linux_syscalls		299
+#define __NR_N32_Linux_syscalls		302
 #ifdef __KERNEL__

arch/mips/kernel/irq-gic.c+2−3

 #include <asm/io.h>
 #include <asm/gic.h>
 #include <asm/gcmpregs.h>
-#include <asm/mips-boards/maltaint.h>
 #include <asm/irq.h>
 #include <linux/hardirq.h>
 #include <asm-generic/bitops/find.h>
 	int		i;
 	irq -= _irqbase;
-	pr_debug(KERN_DEBUG "%s(%d) called\n", __func__, irq);
+	pr_debug("%s(%d) called\n", __func__, irq);
 	cpumask_and(&tmp, cpumask, cpu_online_mask);
 	if (cpus_empty(tmp))
 		return -1;
 	/* Setup specifics */
 	for (i = 0; i < mapsize; i++) {
 		cpu = intrmap[i].cpunum;
-		if (cpu == X)
+		if (cpu == GIC_UNUSED)
 			continue;
 		if (cpu == 0 && i != 0 && intrmap[i].flags == 0)
 			continue;

arch/mips/kernel/kgdb.c+1−1

@@ -283,7 +283,7 @@ static int kgdb_mips_notify(struct notifier_block *self, unsigned long cmd, · 282 unmodified lines
283	struct pt_regs *regs = args->regs;	283	struct pt_regs *regs = args->regs;
284	int trap = (regs->cp0_cause & 0x7c) >> 2;	284	int trap = (regs->cp0_cause & 0x7c) >> 2;
285		285
286	/* Userpace events, ignore. */	286	/* Userspace events, ignore. */
287	if (user_mode(regs))	287	if (user_mode(regs))
288	return NOTIFY_DONE;	288	return NOTIFY_DONE;
289		289

arch/mips/kernel/kspd.c+1−1

@@ -251,7 +251,7 @@ void sp_work_handle_request(void) · 250 unmodified lines
251	memset(&tz, 0, sizeof(tz));	251	memset(&tz, 0, sizeof(tz));
252	if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv,	252	if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv,
253	(int)&tz, 0, 0)) == 0)	253	(int)&tz, 0, 0)) == 0)
254	ret.retval = tv.tv_sec;	254	ret.retval = tv.tv_sec;
255	break;	255	break;
256		256
257	case MTSP_SYSCALL_EXIT:	257	case MTSP_SYSCALL_EXIT:

arch/mips/kernel/linux32.c+7−0

@@ -341,3 +341,10 @@ asmlinkage long sys32_lookup_dcookie(u32 a0, u32 a1, char __user *buf, · 340 unmodified lines
341	{	341	{
342	return sys_lookup_dcookie(merge_64(a0, a1), buf, len);	342	return sys_lookup_dcookie(merge_64(a0, a1), buf, len);
343	}	343	}
		344
		345	SYSCALL_DEFINE6(32_fanotify_mark, int, fanotify_fd, unsigned int, flags,
		346	u64, a3, u64, a4, int, dfd, const char __user *, pathname)
		347	{
		348	return sys_fanotify_mark(fanotify_fd, flags, merge_64(a3, a4),
		349	dfd, pathname);
		350	}

arch/mips/kernel/scall32-o32.S+4−1

 	sys	sys_rt_tgsigqueueinfo	4
 	sys	sys_perf_event_open	5
 	sys	sys_accept4		4
-	sys     sys_recvmmsg            5
+	sys	sys_recvmmsg		5	/* 4335 */
+	sys	sys_fanotify_init	2
+	sys	sys_fanotify_mark	6
+	sys	sys_prlimit64		4
 	.endm
 	/* We pre-compute the number of _instruction_ bytes needed to

arch/mips/kernel/scall64-64.S+5−2

 	PTR	sys_pipe2
 	PTR	sys_inotify_init1
 	PTR	sys_preadv
-	PTR	sys_pwritev			/* 5390 */
+	PTR	sys_pwritev			/* 5290 */
 	PTR	sys_rt_tgsigqueueinfo
 	PTR	sys_perf_event_open
 	PTR	sys_accept4
-	PTR     sys_recvmmsg
+	PTR	sys_recvmmsg
+	PTR	sys_fanotify_init		/* 5295 */
+	PTR	sys_fanotify_mark
+	PTR	sys_prlimit64
 	.size	sys_call_table,.-sys_call_table

arch/mips/kernel/scall64-n32.S+4−1

 	PTR	sys_perf_event_open
 	PTR	sys_accept4
 	PTR     compat_sys_recvmmsg
-	PTR     sys_getdents
+	PTR     sys_getdents64
+	PTR	sys_fanotify_init		/* 6300 */
+	PTR	sys_fanotify_mark
+	PTR	sys_prlimit64
 	.size	sysn32_call_table,.-sysn32_call_table

arch/mips/kernel/scall64-o32.S+4−1

 	PTR	compat_sys_rt_tgsigqueueinfo
 	PTR	sys_perf_event_open
 	PTR	sys_accept4
-	PTR     compat_sys_recvmmsg
+	PTR	compat_sys_recvmmsg		/* 4335 */
+	PTR	sys_fanotify_init
+	PTR	sys_32_fanotify_mark
+	PTR	sys_prlimit64
 	.size	sys_call_table,.-sys_call_table

arch/mips/mm/dma-default.c+20−8

 static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
 {
+	gfp_t dma_flag;
 	/* ignore region specifiers */
 	gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
-#ifdef CONFIG_ZONE_DMA
+#ifdef CONFIG_ISA
 	if (dev == NULL)
-		gfp |= __GFP_DMA;
+		dma_flag = __GFP_DMA;
-	else if (dev->coherent_dma_mask < DMA_BIT_MASK(24))
-		gfp |= __GFP_DMA;
 	else
 #endif
-#ifdef CONFIG_ZONE_DMA32
+#if defined(CONFIG_ZONE_DMA32) && defined(CONFIG_ZONE_DMA)
 	     if (dev->coherent_dma_mask < DMA_BIT_MASK(32))
-		gfp |= __GFP_DMA32;
+			dma_flag = __GFP_DMA;
+	else if (dev->coherent_dma_mask < DMA_BIT_MASK(64))
+			dma_flag = __GFP_DMA32;
+	else
+#endif
+#if defined(CONFIG_ZONE_DMA32) && !defined(CONFIG_ZONE_DMA)
+	     if (dev->coherent_dma_mask < DMA_BIT_MASK(64))
+		dma_flag = __GFP_DMA32;
+	else
+#endif
+#if defined(CONFIG_ZONE_DMA) && !defined(CONFIG_ZONE_DMA32)
+	     if (dev->coherent_dma_mask < DMA_BIT_MASK(64))
+		dma_flag = __GFP_DMA;
 	else
 #endif
-		;
+		dma_flag = 0;
 	/* Don't invoke OOM killer */
 	gfp |= __GFP_NORETRY;
-	return gfp;
+	return gfp | dma_flag;
 }
 void *dma_alloc_noncoherent(struct device *dev, size_t size,

arch/mips/mm/sc-rm7k.c+1−1

@@ -30,7 +30,7 @@ · 29 unmodified lines
30	#define tc_lsize 32	30	#define tc_lsize 32
31		31
32	extern unsigned long icache_way_size, dcache_way_size;	32	extern unsigned long icache_way_size, dcache_way_size;
33	unsigned long tcache_size;	33	static unsigned long tcache_size;
34		34
35	#include <asm/r4kcache.h>	35	#include <asm/r4kcache.h>
36		36

arch/mips/mti-malta/malta-int.c+3−0

  */
 #define GIC_CPU_NMI GIC_MAP_TO_NMI_MSK
+#define X GIC_UNUSED
 static struct gic_intr_map gic_intr_map[GIC_NUM_INTRS] = {
 	{ X, X,		   X,		X,		0 },
 	{ X, X,		   X,	 	X,		0 },
 	{ X, X,		   X,		X,	        0 },
 	/* The remainder of this table is initialised by fill_ipi_map */
 };
+#undef X
 /*
  * GCMP needs to be detected before any SMP initialisation

arch/mips/pci/pci-rc32434.c+1−1

@@ -118,7 +118,7 @@ static int __init rc32434_pcibridge_init(void) · 117 unmodified lines
118	if (!((pcicvalue == PCIM_H_EA) \|\|	118	if (!((pcicvalue == PCIM_H_EA) \|\|
119	(pcicvalue == PCIM_H_IA_FIX) \|\|	119	(pcicvalue == PCIM_H_IA_FIX) \|\|
120	(pcicvalue == PCIM_H_IA_RR))) {	120	(pcicvalue == PCIM_H_IA_RR))) {
121	pr_err(KERN_ERR "PCI init error!!!\n");	121	pr_err("PCI init error!!!\n");
122	/* Not in Host Mode, return ERROR */	122	/* Not in Host Mode, return ERROR */
123	return -1;	123	return -1;
124	}	124	}

arch/mips/pnx8550/common/reset.c+5−15

@@ -22,29 +22,19 @@ · 21 unmodified lines
22	*/	22	*/
23	#include <linux/kernel.h>	23	#include <linux/kernel.h>
24		24
		25	#include <asm/processor.h>
25	#include <asm/reboot.h>	26	#include <asm/reboot.h>
26	#include <glb.h>	27	#include <glb.h>
27		28
28	void pnx8550_machine_restart(char *command)	29	void pnx8550_machine_restart(char *command)
29	{	30	{
30	char head[] = "*********** Machine restart ***********";
31	char foot[] = "*******************************************";
32
33	printk("\n\n");
34	printk("%s\n", head);
35	if (command != NULL)
36	printk("* %s\n", command);
37	printk("%s\n", foot);
38
39	PNX8550_RST_CTL = PNX8550_RST_DO_SW_RST;	31	PNX8550_RST_CTL = PNX8550_RST_DO_SW_RST;
40	}	32	}
41		33
42	void pnx8550_machine_halt(void)	34	void pnx8550_machine_halt(void)
43	{	35	{
44	printk("* Machine halt. (Not implemented) *\n");	36	while (1) {
45	}	37	if (cpu_wait)
46		38	cpu_wait();
47	void pnx8550_machine_power_off(void)	39	}
48	{
49	printk("* Machine power off. (Not implemented) *\n");
50	}	40	}

arch/mips/pnx8550/common/setup.c+1−2

 extern void __init board_setup(void);
 extern void pnx8550_machine_restart(char *);
 extern void pnx8550_machine_halt(void);
-extern void pnx8550_machine_power_off(void);
 extern struct resource ioport_resource;
 extern struct resource iomem_resource;
 extern char *prom_getcmdline(void);
         _machine_restart = pnx8550_machine_restart;
         _machine_halt = pnx8550_machine_halt;
-        pm_power_off = pnx8550_machine_power_off;
+        pm_power_off = pnx8550_machine_halt;
 	/* Clear the Global 2 Register, PCI Inta Output Enable Registers
 	   Bit 1:Enable DAC Powerdown

arch/mn10300/Kconfig+0−1

@@ -8,7 +8,6 @@ mainmenu "Linux Kernel Configuration" · 7 unmodified lines
8	config MN10300	8	config MN10300
9	def_bool y	9	def_bool y
10	select HAVE_OPROFILE	10	select HAVE_OPROFILE
11	select HAVE_ARCH_TRACEHOOK
12		11
13	config AM33	12	config AM33
14	def_bool y	13	def_bool y

arch/mn10300/Kconfig.debug+1−1

@@ -101,7 +101,7 @@ config GDBSTUB_DEBUG_BREAKPOINT · 100 unmodified lines
101		101
102	choice	102	choice
103	prompt "GDB stub port"	103	prompt "GDB stub port"
104	default GDBSTUB_TTYSM0	104	default GDBSTUB_ON_TTYSM0
105	depends on GDBSTUB	105	depends on GDBSTUB
106	help	106	help
107	Select the serial port used for GDB-stub.	107	Select the serial port used for GDB-stub.

arch/mn10300/include/asm/bitops.h+2−2

@@ -229,9 +229,9 @@ int ffs(int x) · 228 unmodified lines
229	#include <asm-generic/bitops/hweight.h>	229	#include <asm-generic/bitops/hweight.h>
230		230
231	#define ext2_set_bit_atomic(lock, nr, addr) \	231	#define ext2_set_bit_atomic(lock, nr, addr) \
232	test_and_set_bit((nr) ^ 0x18, (addr))	232	test_and_set_bit((nr), (addr))
233	#define ext2_clear_bit_atomic(lock, nr, addr) \	233	#define ext2_clear_bit_atomic(lock, nr, addr) \
234	test_and_clear_bit((nr) ^ 0x18, (addr))	234	test_and_clear_bit((nr), (addr))
235		235
236	#include <asm-generic/bitops/ext2-non-atomic.h>	236	#include <asm-generic/bitops/ext2-non-atomic.h>
237	#include <asm-generic/bitops/minix-le.h>	237	#include <asm-generic/bitops/minix-le.h>

arch/mn10300/include/asm/signal.h+1−1

@@ -78,7 +78,7 @@ typedef unsigned long sigset_t; · 77 unmodified lines
78		78
79	/* These should not be considered constants from userland. */	79	/* These should not be considered constants from userland. */
80	#define SIGRTMIN 32	80	#define SIGRTMIN 32
81	#define SIGRTMAX (_NSIG-1)	81	#define SIGRTMAX _NSIG
82		82
83	/*	83	/*
84	* SA_FLAGS values:	84	* SA_FLAGS values:

arch/mn10300/kernel/module.c+1−2

 		    const Elf_Shdr *sechdrs,
 		    struct module *me)
 {
-	return module_bug_finalize(hdr, sechdrs, me);
+	return 0;
 }
 /*
  */
 void module_arch_cleanup(struct module *mod)
 {
-	module_bug_cleanup(mod);
 }

arch/mn10300/kernel/signal.c+20−15

 		old_sigset_t mask;
 		if (verify_area(VERIFY_READ, act, sizeof(*act)) ||
 		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
-		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
+		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer) ||
+		    __get_user(new_ka.sa.sa_flags, &act->sa_flags) ||
+		    __get_user(mask, &act->sa_mask))
 			return -EFAULT;
-		__get_user(new_ka.sa.sa_flags, &act->sa_flags);
-		__get_user(mask, &act->sa_mask);
 		siginitset(&new_ka.sa.sa_mask, mask);
 	}
 	if (!ret && oact) {
 		if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||
 		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
-		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
+		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer) ||
+		    __put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||
+		    __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))
 			return -EFAULT;
-		__put_user(old_ka.sa.sa_flags, &oact->sa_flags);
-		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
 	}
 	return ret;
 {
 	unsigned int err = 0;
+	/* Always make any pending restarted system calls return -EINTR */
+	current_thread_info()->restart_block.fn = do_no_restart_syscall;
 	if (is_using_fpu(current))
 		fpu_kill_state(current);
 	regs->d0 = sig;
 	regs->d1 = (unsigned long) &frame->sc;
-	set_fs(USER_DS);
 	/* the tracer may want to single-step inside the handler */
 	if (test_thread_flag(TIF_SINGLESTEP))
 		ptrace_notify(SIGTRAP);
 	return 0;
 give_sigsegv:
-	force_sig(SIGSEGV, current);
+	force_sigsegv(sig, current);
 	return -EFAULT;
 }
 	regs->d0 = sig;
 	regs->d1 = (long) &frame->info;
-	set_fs(USER_DS);
 	/* the tracer may want to single-step inside the handler */
 	if (test_thread_flag(TIF_SINGLESTEP))
 		ptrace_notify(SIGTRAP);
 	return 0;
 give_sigsegv:
-	force_sig(SIGSEGV, current);
+	force_sigsegv(sig, current);
 	return -EFAULT;
 }
+static inline void stepback(struct pt_regs *regs)
+{
+	regs->pc -= 2;
+	regs->orig_d0 = -1;
+}
 /*
  * handle the actual delivery of a signal to userspace
  */
 			/* fallthrough */
 		case -ERESTARTNOINTR:
 			regs->d0 = regs->orig_d0;
-			regs->pc -= 2;
+			stepback(regs);
 		}
 	}
 		case -ERESTARTSYS:
 		case -ERESTARTNOINTR:
 			regs->d0 = regs->orig_d0;
-			regs->pc -= 2;
+			stepback(regs);
 			break;
 		case -ERESTART_RESTARTBLOCK:
 			regs->d0 = __NR_restart_syscall;
-			regs->pc -= 2;
+			stepback(regs);
 			break;
 		}
 	}

arch/mn10300/mm/Makefile+6−8

 # Makefile for the MN10300-specific memory management code
 #
+cacheflush-y	:= cache.o cache-mn10300.o
+cacheflush-$(CONFIG_MN10300_CACHE_WBACK) += cache-flush-mn10300.o
+cacheflush-$(CONFIG_MN10300_CACHE_DISABLED) := cache-disabled.o
 obj-y := \
 	init.o fault.o pgtable.o extable.o tlb-mn10300.o mmu-context.o \
-	misalignment.o dma-alloc.o
+	misalignment.o dma-alloc.o $(cacheflush-y)
-ifneq ($(CONFIG_MN10300_CACHE_DISABLED),y)
-obj-y	+= cache.o cache-mn10300.o
-ifeq ($(CONFIG_MN10300_CACHE_WBACK),y)
-obj-y	+= cache-flush-mn10300.o
-endif
-endif

arch/mn10300/mm/cache-disabled.c+21−0

@@ -0,0 +1,21 @@
	1	/* Handle the cache being disabled
	2	*
	3	* Copyright (C) 2010 Red Hat, Inc. All Rights Reserved.
	4	* Written by David Howells (dhowells@redhat.com)
	5	*
	6	* This program is free software; you can redistribute it and/or
	7	* modify it under the terms of the GNU General Public Licence
	8	* as published by the Free Software Foundation; either version
	9	* 2 of the Licence, or (at your option) any later version.
	10	*/
	11	#include <linux/mm.h>
	12
	13	/*
	14	* allow userspace to flush the instruction cache
	15	*/
	16	asmlinkage long sys_cacheflush(unsigned long start, unsigned long end)
	17	{
	18	if (end < start)
	19	return -EINVAL;
	20	return 0;
	21	}

arch/mn10300/mm/cache.c+19−1

 void flush_icache_range(unsigned long start, unsigned long end)
 {
 #ifdef CONFIG_MN10300_CACHE_WBACK
-	unsigned long addr, size, off;
+	unsigned long addr, size, base, off;
 	struct page *page;
 	pgd_t *pgd;
 	pud_t *pud;
 	pmd_t *pmd;
 	pte_t *ppte, pte;
+	if (end > 0x80000000UL) {
+		/* addresses above 0xa0000000 do not go through the cache */
+		if (end > 0xa0000000UL) {
+			end = 0xa0000000UL;
+			if (start >= end)
+				return;
+		}
+		/* kernel addresses between 0x80000000 and 0x9fffffff do not
+		 * require page tables, so we just map such addresses directly */
+		base = (start >= 0x80000000UL) ? start : 0x80000000UL;
+		mn10300_dcache_flush_range(base, end);
+		if (base == start)
+			goto invalidate;
+		end = base;
+	}
 	for (; start < end; start += size) {
 		/* work out how much of the page to flush */
 		off = start & (PAGE_SIZE - 1);
 	}
 #endif
+invalidate:
 	mn10300_icache_inv();
 }
 EXPORT_SYMBOL(flush_icache_range);

arch/parisc/kernel/module.c+1−2

 	nsyms = newptr - (Elf_Sym *)symhdr->sh_addr;
 	DEBUGP("NEW num_symtab %lu\n", nsyms);
 	symhdr->sh_size = nsyms * sizeof(Elf_Sym);
-	return module_bug_finalize(hdr, sechdrs, me);
+	return 0;
 }
 void module_arch_cleanup(struct module *mod)
 {
 	deregister_unwind_table(mod);
-	module_bug_cleanup(mod);
 }

arch/powerpc/kernel/module.c+0−6

 		const Elf_Shdr *sechdrs, struct module *me)
 {
 	const Elf_Shdr *sect;
-	int err;
-	err = module_bug_finalize(hdr, sechdrs, me);
-	if (err)
-		return err;
 	/* Apply feature fixups */
 	sect = find_section(hdr, sechdrs, "__ftr_fixup");
 void module_arch_cleanup(struct module *mod)
 {
-	module_bug_cleanup(mod);
 }

arch/powerpc/platforms/512x/clock.c+1−1

@@ -57,7 +57,7 @@ static struct clk mpc5121_clk_get(struct device dev, const char *id) · 56 unmodified lines
57	int id_match = 0;	57	int id_match = 0;
58		58
59	if (dev == NULL \|\| id == NULL)	59	if (dev == NULL \|\| id == NULL)
60	return NULL;	60	return clk;
61		61
62	mutex_lock(&clocks_mutex);	62	mutex_lock(&clocks_mutex);
63	list_for_each_entry(p, &clocks, node) {	63	list_for_each_entry(p, &clocks, node) {

arch/powerpc/platforms/52xx/efika.c+6−3

 	if (bus_range == NULL || len < 2 * sizeof(int)) {
 		printk(KERN_WARNING EFIKA_PLATFORM_NAME
 		       ": Can't get bus-range for %s\n", pcictrl->full_name);
-		return;
+		goto out_put;
 	}
 	if (bus_range[1] == bus_range[0])
 	printk(" controlled by %s\n", pcictrl->full_name);
 	printk("\n");
-	hose = pcibios_alloc_controller(of_node_get(pcictrl));
+	hose = pcibios_alloc_controller(pcictrl);
 	if (!hose) {
 		printk(KERN_WARNING EFIKA_PLATFORM_NAME
 		       ": Can't allocate PCI controller structure for %s\n",
 		       pcictrl->full_name);
-		return;
+		goto out_put;
 	}
 	hose->first_busno = bus_range[0];
 	hose->ops = &rtas_pci_ops;
 	pci_process_bridge_OF_ranges(hose, pcictrl, 0);
+	return;
+out_put:
+	of_node_put(pcictrl);
 }
 #else

arch/powerpc/platforms/52xx/mpc52xx_common.c+6−2

 	clrbits32(&simple_gpio->simple_dvo, sync | out);
 	clrbits8(&wkup_gpio->wkup_dvo, reset);
-	/* wait at lease 1 us */
+	/* wait for 1 us */
-	udelay(2);
+	udelay(1);
 	/* Deassert reset */
 	setbits8(&wkup_gpio->wkup_dvo, reset);
+	/* wait at least 200ns */
+	/* 7 ~= (200ns * timebase) / ns2sec */
+	__delay(7);
 	/* Restore pin-muxing */
 	out_be32(&simple_gpio->port_config, mux);

arch/s390/kernel/module.c+1−2

 {
 	vfree(me->arch.syminfo);
 	me->arch.syminfo = NULL;
-	return module_bug_finalize(hdr, sechdrs, me);
+	return 0;
 }
 void module_arch_cleanup(struct module *mod)
 {
-	module_bug_cleanup(mod);
 }

arch/sh/kernel/module.c+0−2

 	int ret = 0;
 	ret |= module_dwarf_finalize(hdr, sechdrs, me);
-	ret |= module_bug_finalize(hdr, sechdrs, me);
 	return ret;
 }
 void module_arch_cleanup(struct module *mod)
 {
-	module_bug_cleanup(mod);
 	module_dwarf_cleanup(mod);
 }

arch/tile/kernel/intvec_32.S+0−7

@@ -1506,13 +1506,6 @@ handle_ill: · 1505 unmodified lines
1506	}	1506	}
1507	STD_ENDPROC(handle_ill)	1507	STD_ENDPROC(handle_ill)
1508		1508
1509	.pushsection .rodata, "a"
1510	.align 8
1511	bpt_code:
1512	bpt
1513	ENDPROC(bpt_code)
1514	.popsection
1515
1516	/* Various stub interrupt handlers and syscall handlers */	1509	/* Various stub interrupt handlers and syscall handlers */
1517		1510
1518	STD_ENTRY_LOCAL(_kernel_double_fault)	1511	STD_ENTRY_LOCAL(_kernel_double_fault)

arch/um/drivers/net_kern.c+3−14

 	netif_wake_queue(dev);
 }
-static int uml_net_set_mac(struct net_device *dev, void *addr)
-{
-	struct uml_net_private *lp = netdev_priv(dev);
-	struct sockaddr *hwaddr = addr;
-	spin_lock_irq(&lp->lock);
-	eth_mac_addr(dev, hwaddr->sa_data);
-	spin_unlock_irq(&lp->lock);
-	return 0;
-}
 static int uml_net_change_mtu(struct net_device *dev, int new_mtu)
 {
 	dev->mtu = new_mtu;
 	.ndo_start_xmit 	= uml_net_start_xmit,
 	.ndo_set_multicast_list = uml_net_set_multicast_list,
 	.ndo_tx_timeout 	= uml_net_tx_timeout,
-	.ndo_set_mac_address	= uml_net_set_mac,
+	.ndo_set_mac_address	= eth_mac_addr,
 	.ndo_change_mtu 	= uml_net_change_mtu,
 	.ndo_validate_addr	= eth_validate_addr,
 };
 	    ((*transport->user->init)(&lp->user, dev) != 0))
 		goto out_unregister;
-	eth_mac_addr(dev, device->mac);
+	/* don't use eth_mac_addr, it will not work here */
+	memcpy(dev->dev_addr, device->mac, ETH_ALEN);
 	dev->mtu = transport->user->mtu;
 	dev->netdev_ops = &uml_netdev_ops;
 	dev->ethtool_ops = &uml_net_ethtool_ops;

arch/um/kernel/exec.c+3−3

@@ -62,7 +62,7 @@ static long execve1(const char *file, · 61 unmodified lines
62	return error;	62	return error;
63	}	63	}
64		64
65	long um_execve(const char file, char __user __user argv, char __user __user *env)	65	long um_execve(const char file, const char __user const __user argv, const char __user const __user *env)
66	{	66	{
67	long err;	67	long err;
68		68
@@ -72,8 +72,8 @@ long um_execve(const char file, char __user __user argv, char __user __user · 3 unmodified lines
72	return err;	72	return err;
73	}	73	}
74		74
75	long sys_execve(const char __user file, char __user __user *argv,	75	long sys_execve(const char __user file, const char __user const __user *argv,
76	char __user __user env)	76	const char __user const __user env)
77	{	77	{
78	long error;	78	long error;
79	char *filename;	79	char *filename;

arch/um/kernel/internal.h+1−1

@@ -1 +1 @@
1	extern long um_execve(const char file, char __user __user argv, char __user __user *env);	1	extern long um_execve(const char file, const char __user const __user argv, const char __user const __user *env);

arch/um/kernel/syscall.c+2−2

@@ -60,8 +60,8 @@ int kernel_execve(const char *filename, · 59 unmodified lines
60		60
61	fs = get_fs();	61	fs = get_fs();
62	set_fs(KERNEL_DS);	62	set_fs(KERNEL_DS);
63	ret = um_execve(filename, (char __user __user )argv,	63	ret = um_execve(filename, (const char __user const __user )argv,
64	(char __user __user ) envp);	64	(const char __user const __user ) envp);
65	set_fs(fs);	65	set_fs(fs);
66		66
67	return ret;	67	return ret;

arch/x86/boot/early_serial_console.c+13−1

@@ -58,7 +58,19 @@ static void parse_earlyprintk(void) · 57 unmodified lines
58	if (arg[pos] == ',')	58	if (arg[pos] == ',')
59	pos++;	59	pos++;
60		60
61	if (!strncmp(arg, "ttyS", 4)) {	61	/*
		62	* make sure we have
		63	* "serial,0x3f8,115200"
		64	* "serial,ttyS0,115200"
		65	* "ttyS0,115200"
		66	*/
		67	if (pos == 7 && !strncmp(arg + pos, "0x", 2)) {
		68	port = simple_strtoull(arg + pos, &e, 16);
		69	if (port == 0 \|\| arg + pos == e)
		70	port = DEFAULT_SERIAL_PORT;
		71	else
		72	pos = e - arg;
		73	} else if (!strncmp(arg + pos, "ttyS", 4)) {
62	static const int bases[] = { 0x3f8, 0x2f8 };	74	static const int bases[] = { 0x3f8, 0x2f8 };
63	int idx = 0;	75	int idx = 0;
64		76

arch/x86/include/asm/amd_iommu_proto.h+6−0

@@ -38,4 +38,10 @@ static inline void amd_iommu_stats_init(void) { } · 37 unmodified lines
38		38
39	#endif /* !CONFIG_AMD_IOMMU_STATS */	39	#endif /* !CONFIG_AMD_IOMMU_STATS */
40		40
		41	static inline bool is_rd890_iommu(struct pci_dev *pdev)
		42	{
		43	return (pdev->vendor == PCI_VENDOR_ID_ATI) &&
		44	(pdev->device == PCI_DEVICE_ID_RD890_IOMMU);
		45	}
		46
41	#endif /* _ASM_X86_AMD_IOMMU_PROTO_H */	47	#endif /* _ASM_X86_AMD_IOMMU_PROTO_H */

arch/x86/include/asm/amd_iommu_types.h+12−0

 	/* capabilities of that IOMMU read from ACPI */
 	u32 cap;
+	/* flags read from acpi table */
+	u8 acpi_flags;
 	/*
 	 * Capability pointer. There could be more than one IOMMU per PCI
 	 * device function if there are more than one AMD IOMMU capability
 	/* default dma_ops domain for that IOMMU */
 	struct dma_ops_domain *default_dom;
+	/*
+	 * This array is required to work around a potential BIOS bug.
+	 * The BIOS may miss to restore parts of the PCI configuration
+	 * space when the system resumes from S3. The result is that the
+	 * IOMMU does not execute commands anymore which leads to system
+	 * failure.
+	 */
+	u32 cache_cfg[4];
 };
 /*

arch/x86/include/asm/bitops.h+1−1

@@ -309,7 +309,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr) · 308 unmodified lines
309	static __always_inline int constant_test_bit(unsigned int nr, const volatile unsigned long *addr)	309	static __always_inline int constant_test_bit(unsigned int nr, const volatile unsigned long *addr)
310	{	310	{
311	return ((1UL << (nr % BITS_PER_LONG)) &	311	return ((1UL << (nr % BITS_PER_LONG)) &
312	(((unsigned long *)addr)[nr / BITS_PER_LONG])) != 0;	312	(addr[nr / BITS_PER_LONG])) != 0;
313	}	313	}
314		314
315	static inline int variable_test_bit(int nr, volatile const unsigned long *addr)	315	static inline int variable_test_bit(int nr, volatile const unsigned long *addr)

arch/x86/include/asm/cpufeature.h+1−0

@@ -168,6 +168,7 @@ · 167 unmodified lines
168	#define X86_FEATURE_XSAVEOPT (732+ 4) / Optimized Xsave */	168	#define X86_FEATURE_XSAVEOPT (732+ 4) / Optimized Xsave */
169	#define X86_FEATURE_PLN (732+ 5) / Intel Power Limit Notification */	169	#define X86_FEATURE_PLN (732+ 5) / Intel Power Limit Notification */
170	#define X86_FEATURE_PTS (732+ 6) / Intel Package Thermal Status */	170	#define X86_FEATURE_PTS (732+ 6) / Intel Package Thermal Status */
		171	#define X86_FEATURE_DTS (732+ 7) / Digital Thermal Sensor */
171		172
172	/* Virtualization flags: Linux defined, word 8 */	173	/* Virtualization flags: Linux defined, word 8 */
173	#define X86_FEATURE_TPR_SHADOW (832+ 0) / Intel TPR Shadow */	174	#define X86_FEATURE_TPR_SHADOW (832+ 0) / Intel TPR Shadow */

arch/x86/kernel/acpi/cstate.c+1−1

@@ -61,7 +61,7 @@ struct cstate_entry { · 60 unmodified lines
61	unsigned int ecx;	61	unsigned int ecx;
62	} states[ACPI_PROCESSOR_MAX_POWER];	62	} states[ACPI_PROCESSOR_MAX_POWER];
63	};	63	};
64	static struct cstate_entry cpu_cstate_entry; / per CPU ptr */	64	static struct cstate_entry __percpu cpu_cstate_entry; / per CPU ptr */
65		65
66	static short mwait_supported[ACPI_PROCESSOR_MAX_POWER];	66	static short mwait_supported[ACPI_PROCESSOR_MAX_POWER];
67		67

arch/x86/kernel/amd_iommu.c+3−1

 			   size_t size,
 			   int dir)
 {
+	dma_addr_t flush_addr;
 	dma_addr_t i, start;
 	unsigned int pages;
 	    (dma_addr + size > dma_dom->aperture_size))
 		return;
+	flush_addr = dma_addr;
 	pages = iommu_num_pages(dma_addr, size, PAGE_SIZE);
 	dma_addr &= PAGE_MASK;
 	start = dma_addr;
 	dma_ops_free_addresses(dma_dom, dma_addr, pages);
 	if (amd_iommu_unmap_flush || dma_dom->need_flush) {
-		iommu_flush_pages(&dma_dom->domain, dma_addr, size);
+		iommu_flush_pages(&dma_dom->domain, flush_addr, size);
 		dma_dom->need_flush = false;
 	}
 }

arch/x86/kernel/amd_iommu_init.c+45−22

 	iommu->last_device = calc_devid(MMIO_GET_BUS(range),
 					MMIO_GET_LD(range));
 	iommu->evt_msi_num = MMIO_MSI_NUM(misc);
+	if (is_rd890_iommu(iommu->dev)) {
+		pci_read_config_dword(iommu->dev, 0xf0, &iommu->cache_cfg[0]);
+		pci_read_config_dword(iommu->dev, 0xf4, &iommu->cache_cfg[1]);
+		pci_read_config_dword(iommu->dev, 0xf8, &iommu->cache_cfg[2]);
+		pci_read_config_dword(iommu->dev, 0xfc, &iommu->cache_cfg[3]);
+	}
 }
 /*
 	struct ivhd_entry *e;
 	/*
-	 * First set the recommended feature enable bits from ACPI
+	 * First save the recommended feature enable bits from ACPI
-	 * into the IOMMU control registers
 	 */
-	h->flags & IVHD_FLAG_HT_TUN_EN_MASK ?
+	iommu->acpi_flags = h->flags;
-		iommu_feature_enable(iommu, CONTROL_HT_TUN_EN) :
-		iommu_feature_disable(iommu, CONTROL_HT_TUN_EN);
-	h->flags & IVHD_FLAG_PASSPW_EN_MASK ?
-		iommu_feature_enable(iommu, CONTROL_PASSPW_EN) :
-		iommu_feature_disable(iommu, CONTROL_PASSPW_EN);
-	h->flags & IVHD_FLAG_RESPASSPW_EN_MASK ?
-		iommu_feature_enable(iommu, CONTROL_RESPASSPW_EN) :
-		iommu_feature_disable(iommu, CONTROL_RESPASSPW_EN);
-	h->flags & IVHD_FLAG_ISOC_EN_MASK ?
-		iommu_feature_enable(iommu, CONTROL_ISOC_EN) :
-		iommu_feature_disable(iommu, CONTROL_ISOC_EN);
-	/*
-	 * make IOMMU memory accesses cache coherent
-	 */
-	iommu_feature_enable(iommu, CONTROL_COHERENT_EN);
 	/*
 	 * Done. Now parse the device entries
 	}
 }
+static void iommu_init_flags(struct amd_iommu *iommu)
+{
+	iommu->acpi_flags & IVHD_FLAG_HT_TUN_EN_MASK ?
+		iommu_feature_enable(iommu, CONTROL_HT_TUN_EN) :
+		iommu_feature_disable(iommu, CONTROL_HT_TUN_EN);
+	iommu->acpi_flags & IVHD_FLAG_PASSPW_EN_MASK ?
+		iommu_feature_enable(iommu, CONTROL_PASSPW_EN) :
+		iommu_feature_disable(iommu, CONTROL_PASSPW_EN);
+	iommu->acpi_flags & IVHD_FLAG_RESPASSPW_EN_MASK ?
+		iommu_feature_enable(iommu, CONTROL_RESPASSPW_EN) :
+		iommu_feature_disable(iommu, CONTROL_RESPASSPW_EN);
+	iommu->acpi_flags & IVHD_FLAG_ISOC_EN_MASK ?
+		iommu_feature_enable(iommu, CONTROL_ISOC_EN) :
+		iommu_feature_disable(iommu, CONTROL_ISOC_EN);
+	/*
+	 * make IOMMU memory accesses cache coherent
+	 */
+	iommu_feature_enable(iommu, CONTROL_COHERENT_EN);
+}
+static void iommu_apply_quirks(struct amd_iommu *iommu)
+{
+	if (is_rd890_iommu(iommu->dev)) {
+		pci_write_config_dword(iommu->dev, 0xf0, iommu->cache_cfg[0]);
+		pci_write_config_dword(iommu->dev, 0xf4, iommu->cache_cfg[1]);
+		pci_write_config_dword(iommu->dev, 0xf8, iommu->cache_cfg[2]);
+		pci_write_config_dword(iommu->dev, 0xfc, iommu->cache_cfg[3]);
+	}
+}
 /*
  * This function finally enables all IOMMUs found in the system after
  * they have been initialized
 	for_each_iommu(iommu) {
 		iommu_disable(iommu);
+		iommu_apply_quirks(iommu);
+		iommu_init_flags(iommu);
 		iommu_set_device_table(iommu);
 		iommu_enable_command_buffer(iommu);
 		iommu_enable_event_buffer(iommu);

arch/x86/kernel/apic/io_apic.c+8−3

 	old_cfg = old_desc->chip_data;
-	memcpy(cfg, old_cfg, sizeof(struct irq_cfg));
+	cfg->vector = old_cfg->vector;
+	cfg->move_in_progress = old_cfg->move_in_progress;
+	cpumask_copy(cfg->domain, old_cfg->domain);
+	cpumask_copy(cfg->old_domain, old_cfg->old_domain);
 	init_copy_irq_2_pin(old_cfg, cfg, node);
 }
-static void free_irq_cfg(struct irq_cfg *old_cfg)
+static void free_irq_cfg(struct irq_cfg *cfg)
 {
-	kfree(old_cfg);
+	free_cpumask_var(cfg->domain);
+	free_cpumask_var(cfg->old_domain);
+	kfree(cfg);
 }
 void arch_free_chip_data(struct irq_desc *old_desc, struct irq_desc *desc)

arch/x86/kernel/cpu/common.c+1−1

@@ -545,7 +545,7 @@ void __cpuinit cpu_detect(struct cpuinfo_x86 *c) · 544 unmodified lines
545	}	545	}
546	}	546	}
547		547
548	static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)	548	void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)
549	{	549	{
550	u32 tfms, xlvl;	550	u32 tfms, xlvl;
551	u32 ebx;	551	u32 ebx;

arch/x86/kernel/cpu/cpu.h+1−0

@@ -33,5 +33,6 @@ extern const struct cpu_dev *const __x86_cpu_dev_start[], · 32 unmodified lines
33	*const __x86_cpu_dev_end[];	33	*const __x86_cpu_dev_end[];
34		34
35	extern void cpu_detect_cache_sizes(struct cpuinfo_x86 *c);	35	extern void cpu_detect_cache_sizes(struct cpuinfo_x86 *c);
		36	extern void get_cpu_cap(struct cpuinfo_x86 *c);
36		37
37	#endif	38	#endif

arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c+12−6

 		return -ENODEV;
 	out_obj = output.pointer;
-	if (out_obj->type != ACPI_TYPE_BUFFER)
+	if (out_obj->type != ACPI_TYPE_BUFFER) {
-		return -ENODEV;
+		ret = -ENODEV;
+		goto out_free;
+	}
 	errors = *((u32 *)out_obj->buffer.pointer) & ~(1 << 0);
-	if (errors)
+	if (errors) {
-		return -ENODEV;
+		ret = -ENODEV;
+		goto out_free;
+	}
 	supported = *((u32 *)(out_obj->buffer.pointer + 4));
-	if (!(supported & 0x1))
+	if (!(supported & 0x1)) {
-		return -ENODEV;
+		ret = -ENODEV;
+		goto out_free;
+	}
 out_free:
 	kfree(output.pointer);

arch/x86/kernel/cpu/intel.c+1−0

@@ -39,6 +39,7 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) · 38 unmodified lines
39	misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID;	39	misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID;
40	wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable);	40	wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
41	c->cpuid_level = cpuid_eax(0);	41	c->cpuid_level = cpuid_eax(0);
		42	get_cpu_cap(c);
42	}	43	}
43	}	44	}
44		45

arch/x86/kernel/cpu/scattered.c+1−0

@@ -31,6 +31,7 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c) · 30 unmodified lines
31	const struct cpuid_bit *cb;	31	const struct cpuid_bit *cb;
32		32
33	static const struct cpuid_bit __cpuinitconst cpuid_bits[] = {	33	static const struct cpuid_bit __cpuinitconst cpuid_bits[] = {
		34	{ X86_FEATURE_DTS, CR_EAX, 0, 0x00000006, 0 },
34	{ X86_FEATURE_IDA, CR_EAX, 1, 0x00000006, 0 },	35	{ X86_FEATURE_IDA, CR_EAX, 1, 0x00000006, 0 },
35	{ X86_FEATURE_ARAT, CR_EAX, 2, 0x00000006, 0 },	36	{ X86_FEATURE_ARAT, CR_EAX, 2, 0x00000006, 0 },
36	{ X86_FEATURE_PLN, CR_EAX, 4, 0x00000006, 0 },	37	{ X86_FEATURE_PLN, CR_EAX, 4, 0x00000006, 0 },

arch/x86/kernel/hpet.c+1−1

@@ -506,7 +506,7 @@ static int hpet_assign_irq(struct hpet_dev *dev) · 505 unmodified lines
506	{	506	{
507	unsigned int irq;	507	unsigned int irq;
508		508
509	irq = create_irq();	509	irq = create_irq_nr(0, -1);
510	if (!irq)	510	if (!irq)
511	return -EINVAL;	511	return -EINVAL;
512		512

arch/x86/kernel/module.c+1−2

 	/* make jump label nops */
 	jump_label_apply_nops(me);
-	return module_bug_finalize(hdr, sechdrs, me);
+	return 0;
 }
 void module_arch_cleanup(struct module *mod)
 {
 	alternatives_smp_module_del(mod);
-	module_bug_cleanup(mod);
 }

arch/x86/xen/time.c+3−2

 __init void xen_hvm_init_time_ops(void)
 {
 	/* vector callback is needed otherwise we cannot receive interrupts
-	 * on cpu > 0 */
+	 * on cpu > 0 and at this point we don't know how many cpus are
-	if (!xen_have_vector_callback && num_present_cpus() > 1)
+	 * available */
+	if (!xen_have_vector_callback)
 		return;
 	if (!xen_feature(XENFEAT_hvm_safe_pvclock)) {
 		printk(KERN_INFO "Xen doesn't support pvclock on HVM,"

block/blk-merge.c+12−0

@@ -361,6 +361,18 @@ static int attempt_merge(struct request_queue q, struct request req, · 360 unmodified lines
361	if (!rq_mergeable(req) \|\| !rq_mergeable(next))	361	if (!rq_mergeable(req) \|\| !rq_mergeable(next))
362	return 0;	362	return 0;
363		363
		364	/*
		365	* Don't merge file system requests and discard requests
		366	*/
		367	if ((req->cmd_flags & REQ_DISCARD) != (next->cmd_flags & REQ_DISCARD))
		368	return 0;
		369
		370	/*
		371	* Don't merge discard requests and secure discard requests
		372	*/
		373	if ((req->cmd_flags & REQ_SECURE) != (next->cmd_flags & REQ_SECURE))
		374	return 0;
		375
364	/*	376	/*
365	* not contiguous	377	* not contiguous
366	*/	378	*/

drivers/acpi/Kconfig+1−1

@@ -105,7 +105,7 @@ config ACPI_EC_DEBUGFS · 104 unmodified lines
105		105
106	Be aware that using this interface can confuse your Embedded	106	Be aware that using this interface can confuse your Embedded
107	Controller in a way that a normal reboot is not enough. You then	107	Controller in a way that a normal reboot is not enough. You then
108	have to power of your system, and remove the laptop battery for	108	have to power off your system, and remove the laptop battery for
109	some seconds.	109	some seconds.
110	An Embedded Controller typically is available on laptops and reads	110	An Embedded Controller typically is available on laptops and reads
111	sensor values like battery state and temperature.	111	sensor values like battery state and temperature.

drivers/acpi/acpi_pad.c+18−16

@@ -382,31 +382,32 @@ static void acpi_pad_remove_sysfs(struct acpi_device *device) · 381 unmodified lines
382	device_remove_file(&device->dev, &dev_attr_rrtime);	382	device_remove_file(&device->dev, &dev_attr_rrtime);
383	}	383	}
384		384
385	/* Query firmware how many CPUs should be idle */	385	/*
386	static int acpi_pad_pur(acpi_handle handle, int *num_cpus)	386	* Query firmware how many CPUs should be idle
		387	* return -1 on failure
		388	*/
		389	static int acpi_pad_pur(acpi_handle handle)
387	{	390	{
388	struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};	391	struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
389	union acpi_object *package;	392	union acpi_object *package;
390	int rev, num, ret = -EINVAL;	393	int num = -1;
391		394
392	if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer)))	395	if (ACPI_FAILURE(acpi_evaluate_object(handle, "_PUR", NULL, &buffer)))
393	return -EINVAL;	396	return num;
394		397
395	if (!buffer.length \|\| !buffer.pointer)	398	if (!buffer.length \|\| !buffer.pointer)
396	return -EINVAL;	399	return num;
397		400
398	package = buffer.pointer;	401	package = buffer.pointer;
399	if (package->type != ACPI_TYPE_PACKAGE \|\| package->package.count != 2)	402
400	goto out;	403	if (package->type == ACPI_TYPE_PACKAGE &&
401	rev = package->package.elements[0].integer.value;	404	package->package.count == 2 &&
402	num = package->package.elements[1].integer.value;	405	package->package.elements[0].integer.value == 1) /* rev 1 */
403	if (rev != 1 \|\| num < 0)	406
404	goto out;	407	num = package->package.elements[1].integer.value;
405	*num_cpus = num;	408
406	ret = 0;
407	out:
408	kfree(buffer.pointer);	409	kfree(buffer.pointer);
409	return ret;	410	return num;
410	}	411	}
411		412
412	/* Notify firmware how many CPUs are idle */	413	/* Notify firmware how many CPUs are idle */
@@ -433,7 +434,8 @@ static void acpi_pad_handle_notify(acpi_handle handle) · 20 unmodified lines
433	uint32_t idle_cpus;	434	uint32_t idle_cpus;
434		435
435	mutex_lock(&isolated_cpus_lock);	436	mutex_lock(&isolated_cpus_lock);
436	if (acpi_pad_pur(handle, &num_cpus)) {	437	num_cpus = acpi_pad_pur(handle);
		438	if (num_cpus < 0) {
437	mutex_unlock(&isolated_cpus_lock);	439	mutex_unlock(&isolated_cpus_lock);
438	return;	440	return;
439	}	441	}

drivers/acpi/acpica/aclocal.h+1−0

@@ -854,6 +854,7 @@ struct acpi_bit_register_info { · 853 unmodified lines
854	ACPI_BITMASK_POWER_BUTTON_STATUS \| \	854	ACPI_BITMASK_POWER_BUTTON_STATUS \| \
855	ACPI_BITMASK_SLEEP_BUTTON_STATUS \| \	855	ACPI_BITMASK_SLEEP_BUTTON_STATUS \| \
856	ACPI_BITMASK_RT_CLOCK_STATUS \| \	856	ACPI_BITMASK_RT_CLOCK_STATUS \| \
		857	ACPI_BITMASK_PCIEXP_WAKE_DISABLE \| \
857	ACPI_BITMASK_WAKE_STATUS)	858	ACPI_BITMASK_WAKE_STATUS)
858		859
859	#define ACPI_BITMASK_TIMER_ENABLE 0x0001	860	#define ACPI_BITMASK_TIMER_ENABLE 0x0001

drivers/acpi/acpica/exutils.c+1−1

@@ -109,7 +109,7 @@ void acpi_ex_enter_interpreter(void) · 108 unmodified lines
109	*	109	*
110	* DESCRIPTION: Reacquire the interpreter execution region from within the	110	* DESCRIPTION: Reacquire the interpreter execution region from within the
111	* interpreter code. Failure to enter the interpreter region is a	111	* interpreter code. Failure to enter the interpreter region is a
112	* fatal system error. Used in conjuction with	112	* fatal system error. Used in conjunction with
113	* relinquish_interpreter	113	* relinquish_interpreter
114	*	114	*
115	******************************************************************************/	115	******************************************************************************/

drivers/acpi/acpica/rsutils.c+1−1

@@ -149,7 +149,7 @@ acpi_rs_move_data(void destination, void source, u16 item_count, u8 move_type) · 148 unmodified lines
149		149
150	/*	150	/*
151	* 16-, 32-, and 64-bit cases must use the move macros that perform	151	* 16-, 32-, and 64-bit cases must use the move macros that perform
152	* endian conversion and/or accomodate hardware that cannot perform	152	* endian conversion and/or accommodate hardware that cannot perform
153	* misaligned memory transfers	153	* misaligned memory transfers
154	*/	154	*/
155	case ACPI_RSC_MOVE16:	155	case ACPI_RSC_MOVE16:

drivers/acpi/apei/Kconfig+1−1

@@ -34,6 +34,6 @@ config ACPI_APEI_ERST_DEBUG · 33 unmodified lines
34	depends on ACPI_APEI	34	depends on ACPI_APEI
35	help	35	help
36	ERST is a way provided by APEI to save and retrieve hardware	36	ERST is a way provided by APEI to save and retrieve hardware
37	error infomation to and from a persistent store. Enable this	37	error information to and from a persistent store. Enable this
38	if you want to debugging and testing the ERST kernel support	38	if you want to debugging and testing the ERST kernel support
39	and firmware implementation.	39	and firmware implementation.

drivers/acpi/apei/apei-base.c+16−5

 int apei_resources_request(struct apei_resources *resources,
 			   const char *desc)
 {
-	struct apei_res *res, *res_bak;
+	struct apei_res *res, *res_bak = NULL;
 	struct resource *r;
+	int rc;
-	apei_resources_sub(resources, &apei_resources_all);
+	rc = apei_resources_sub(resources, &apei_resources_all);
+	if (rc)
+		return rc;
+	rc = -EINVAL;
 	list_for_each_entry(res, &resources->iomem, list) {
 		r = request_mem_region(res->start, res->end - res->start,
 				       desc);
 		}
 	}
-	apei_resources_merge(&apei_resources_all, resources);
+	rc = apei_resources_merge(&apei_resources_all, resources);
+	if (rc) {
+		pr_err(APEI_PFX "Fail to merge resources!\n");
+		goto err_unmap_ioport;
+	}
 	return 0;
 err_unmap_ioport:
 			break;
 		release_mem_region(res->start, res->end - res->start);
 	}
-	return -EINVAL;
+	return rc;
 }
 EXPORT_SYMBOL_GPL(apei_resources_request);
 void apei_resources_release(struct apei_resources *resources)
 {
+	int rc;
 	struct apei_res *res;
 	list_for_each_entry(res, &resources->iomem, list)
 	list_for_each_entry(res, &resources->ioport, list)
 		release_region(res->start, res->end - res->start);
-	apei_resources_sub(&apei_resources_all, resources);
+	rc = apei_resources_sub(&apei_resources_all, resources);
+	if (rc)
+		pr_err(APEI_PFX "Fail to sub resources!\n");
 }
 EXPORT_SYMBOL_GPL(apei_resources_release);

drivers/acpi/apei/einj.c+3−1

 static int einj_check_table(struct acpi_table_einj *einj_tab)
 {
-	if (einj_tab->header_length != sizeof(struct acpi_table_einj))
+	if ((einj_tab->header_length !=
+	     (sizeof(struct acpi_table_einj) - sizeof(einj_tab->header)))
+	    && (einj_tab->header_length != sizeof(struct acpi_table_einj)))
 		return -EINVAL;
 	if (einj_tab->header.length < sizeof(struct acpi_table_einj))
 		return -EINVAL;

drivers/acpi/apei/erst-dbg.c+11−7

  * APEI Error Record Serialization Table debug support
  *
  * ERST is a way provided by APEI to save and retrieve hardware error
- * infomation to and from a persistent store. This file provide the
+ * information to and from a persistent store. This file provide the
  * debugging/testing support for ERST kernel support and firmware
  * implementation.
  *
 		goto out;
 	}
 	if (len > erst_dbg_buf_len) {
-		kfree(erst_dbg_buf);
+		void *p;
 		rc = -ENOMEM;
-		erst_dbg_buf = kmalloc(len, GFP_KERNEL);
+		p = kmalloc(len, GFP_KERNEL);
-		if (!erst_dbg_buf)
+		if (!p)
 			goto out;
+		kfree(erst_dbg_buf);
+		erst_dbg_buf = p;
 		erst_dbg_buf_len = len;
 		goto retry;
 	}
 	if (mutex_lock_interruptible(&erst_dbg_mutex))
 		return -EINTR;
 	if (usize > erst_dbg_buf_len) {
-		kfree(erst_dbg_buf);
+		void *p;
 		rc = -ENOMEM;
-		erst_dbg_buf = kmalloc(usize, GFP_KERNEL);
+		p = kmalloc(usize, GFP_KERNEL);
-		if (!erst_dbg_buf)
+		if (!p)
 			goto out;
+		kfree(erst_dbg_buf);
+		erst_dbg_buf = p;
 		erst_dbg_buf_len = usize;
 	}
 	rc = copy_from_user(erst_dbg_buf, ubuf, usize);

drivers/acpi/apei/erst.c+24−5

@@ -2,7 +2,7 @@ · 1 unmodified line
2	* APEI Error Record Serialization Table support	2	* APEI Error Record Serialization Table support
3	*	3	*
4	* ERST is a way provided by APEI to save and retrieve hardware error	4	* ERST is a way provided by APEI to save and retrieve hardware error
5	* infomation to and from a persistent store.	5	* information to and from a persistent store.
6	*	6	*
7	* For more information about ERST, please refer to ACPI Specification	7	* For more information about ERST, please refer to ACPI Specification
8	* version 4.0, section 17.4.	8	* version 4.0, section 17.4.
@@ -266,13 +266,30 @@ static int erst_exec_move_data(struct apei_exec_context *ctx, · 257 unmodified lines
266	{	266	{
267	int rc;	267	int rc;
268	u64 offset;	268	u64 offset;
		269	void src, dst;
		270
		271	/* ioremap does not work in interrupt context */
		272	if (in_interrupt()) {
		273	pr_warning(ERST_PFX
		274	"MOVE_DATA can not be used in interrupt context");
		275	return -EBUSY;
		276	}
269		277
270	rc = __apei_exec_read_register(entry, &offset);	278	rc = __apei_exec_read_register(entry, &offset);
271	if (rc)	279	if (rc)
272	return rc;	280	return rc;
273	memmove((void *)ctx->dst_base + offset,	281
274	(void *)ctx->src_base + offset,	282	src = ioremap(ctx->src_base + offset, ctx->var2);
275	ctx->var2);	283	if (!src)
		284	return -ENOMEM;
		285	dst = ioremap(ctx->dst_base + offset, ctx->var2);
		286	if (!dst)
		287	return -ENOMEM;
		288
		289	memmove(dst, src, ctx->var2);
		290
		291	iounmap(src);
		292	iounmap(dst);
276		293
277	return 0;	294	return 0;
278	}	295	}
@@ -750,7 +767,9 @@ __setup("erst_disable", setup_erst_disable); · 471 unmodified lines
750		767
751	static int erst_check_table(struct acpi_table_erst *erst_tab)	768	static int erst_check_table(struct acpi_table_erst *erst_tab)
752	{	769	{
753	if (erst_tab->header_length != sizeof(struct acpi_table_erst))	770	if ((erst_tab->header_length !=
		771	(sizeof(struct acpi_table_erst) - sizeof(erst_tab->header)))
		772	&& (erst_tab->header_length != sizeof(struct acpi_table_einj)))
754	return -EINVAL;	773	return -EINVAL;
755	if (erst_tab->header.length < sizeof(struct acpi_table_erst))	774	if (erst_tab->header.length < sizeof(struct acpi_table_erst))
756	return -EINVAL;	775	return -EINVAL;

drivers/acpi/apei/ghes.c+1−1

@@ -302,7 +302,7 @@ static int __devinit ghes_probe(struct platform_device *ghes_dev) · 301 unmodified lines
302	struct ghes *ghes = NULL;	302	struct ghes *ghes = NULL;
303	int rc = -EINVAL;	303	int rc = -EINVAL;
304		304
305	generic = ghes_dev->dev.platform_data;	305	generic = (struct acpi_hest_generic *)ghes_dev->dev.platform_data;
306	if (!generic->enabled)	306	if (!generic->enabled)
307	return -ENODEV;	307	return -ENODEV;
308		308

drivers/acpi/apei/hest.c+7−4

@@ -137,20 +137,23 @@ static int hest_parse_ghes_count(struct acpi_hest_header hest_hdr, void data) · 136 unmodified lines
137		137
138	static int hest_parse_ghes(struct acpi_hest_header hest_hdr, void data)	138	static int hest_parse_ghes(struct acpi_hest_header hest_hdr, void data)
139	{	139	{
140	struct acpi_hest_generic *generic;
141	struct platform_device *ghes_dev;	140	struct platform_device *ghes_dev;
142	struct ghes_arr *ghes_arr = data;	141	struct ghes_arr *ghes_arr = data;
143	int rc;	142	int rc;
144		143
145	if (hest_hdr->type != ACPI_HEST_TYPE_GENERIC_ERROR)	144	if (hest_hdr->type != ACPI_HEST_TYPE_GENERIC_ERROR)
146	return 0;	145	return 0;
147	generic = (struct acpi_hest_generic *)hest_hdr;	146
148	if (!generic->enabled)	147	if (!((struct acpi_hest_generic *)hest_hdr)->enabled)
149	return 0;	148	return 0;
150	ghes_dev = platform_device_alloc("GHES", hest_hdr->source_id);	149	ghes_dev = platform_device_alloc("GHES", hest_hdr->source_id);
151	if (!ghes_dev)	150	if (!ghes_dev)
152	return -ENOMEM;	151	return -ENOMEM;
153	ghes_dev->dev.platform_data = generic;	152
		153	rc = platform_device_add_data(ghes_dev, &hest_hdr, sizeof(void *));
		154	if (rc)
		155	goto err;
		156
154	rc = platform_device_add(ghes_dev);	157	rc = platform_device_add(ghes_dev);
155	if (rc)	158	if (rc)
156	goto err;	159	goto err;

drivers/acpi/atomicio.c+1−1

@@ -142,7 +142,7 @@ static void __iomem *acpi_pre_map(phys_addr_t paddr, · 141 unmodified lines
142	list_add_tail_rcu(&map->list, &acpi_iomaps);	142	list_add_tail_rcu(&map->list, &acpi_iomaps);
143	spin_unlock_irqrestore(&acpi_iomaps_lock, flags);	143	spin_unlock_irqrestore(&acpi_iomaps_lock, flags);
144		144
145	return vaddr + (paddr - pg_off);	145	return map->vaddr + (paddr - map->paddr);
146	err_unmap:	146	err_unmap:
147	iounmap(vaddr);	147	iounmap(vaddr);
148	return NULL;	148	return NULL;

drivers/acpi/battery.c+0−1

@@ -273,7 +273,6 @@ static enum power_supply_property energy_battery_props[] = { · 272 unmodified lines
273	POWER_SUPPLY_PROP_CYCLE_COUNT,	273	POWER_SUPPLY_PROP_CYCLE_COUNT,
274	POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,	274	POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
275	POWER_SUPPLY_PROP_VOLTAGE_NOW,	275	POWER_SUPPLY_PROP_VOLTAGE_NOW,
276	POWER_SUPPLY_PROP_CURRENT_NOW,
277	POWER_SUPPLY_PROP_POWER_NOW,	276	POWER_SUPPLY_PROP_POWER_NOW,
278	POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,	277	POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
279	POWER_SUPPLY_PROP_ENERGY_FULL,	278	POWER_SUPPLY_PROP_ENERGY_FULL,

drivers/acpi/blacklist.c+18−0

 {
 	printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);
 	acpi_osi_setup("!Windows 2006");
+	acpi_osi_setup("!Windows 2006 SP1");
+	acpi_osi_setup("!Windows 2006 SP2");
 	return 0;
 }
 static int __init dmi_disable_osi_win7(const struct dmi_system_id *d)
 		},
 	},
 	{
+	.callback = dmi_disable_osi_vista,
+	.ident = "Toshiba Satellite L355",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "Satellite L355"),
+		},
+	},
+	{
 	.callback = dmi_disable_osi_win7,
 	.ident = "ASUS K50IJ",
 	.matches = {
 		     DMI_MATCH(DMI_PRODUCT_NAME, "K50IJ"),
 		},
 	},
+	{
+	.callback = dmi_disable_osi_vista,
+	.ident = "Toshiba P305D",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+		     DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P305D"),
+		},
+	},
 	/*
 	 * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.

drivers/acpi/bus.c+5−13

 static int set_power_nocheck(const struct dmi_system_id *id)
 {
 	printk(KERN_NOTICE PREFIX "%s detected - "
-		"disable power check in power transistion\n", id->ident);
+		"disable power check in power transition\n", id->ident);
 	acpi_power_nocheck = 1;
 	return 0;
 }
 static struct dmi_system_id dsdt_dmi_table[] __initdata = {
 	/*
-	 * Insyde BIOS on some TOSHIBA machines corrupt the DSDT.
+	 * Invoke DSDT corruption work-around on all Toshiba Satellite.
 	 * https://bugzilla.kernel.org/show_bug.cgi?id=14679
 	 */
 	{
 	 .callback = set_copy_dsdt,
-	 .ident = "TOSHIBA Satellite A505",
+	 .ident = "TOSHIBA Satellite",
 	 .matches = {
 		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-		DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A505"),
+		DMI_MATCH(DMI_PRODUCT_NAME, "Satellite"),
-		},
-	},
-	{
-	 .callback = set_copy_dsdt,
-	 .ident = "TOSHIBA Satellite L505D",
-	 .matches = {
-		DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-		DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L505D"),
 		},
 	},
 	{}
 	/*
 	 * If the laptop falls into the DMI check table, the power state check
-	 * will be disabled in the course of device power transistion.
+	 * will be disabled in the course of device power transition.
 	 */
 	dmi_check_system(power_nocheck_dmi_table);

drivers/acpi/fan.c+2−0

@@ -369,7 +369,9 @@ static void __exit acpi_fan_exit(void) · 368 unmodified lines
369		369
370	acpi_bus_unregister_driver(&acpi_fan_driver);	370	acpi_bus_unregister_driver(&acpi_fan_driver);
371		371
		372	#ifdef CONFIG_ACPI_PROCFS
372	remove_proc_entry(ACPI_FAN_CLASS, acpi_root_dir);	373	remove_proc_entry(ACPI_FAN_CLASS, acpi_root_dir);
		374	#endif
373		375
374	return;	376	return;
375	}	377	}

drivers/acpi/processor_core.c+0−6

 }
 static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = {
-	{
-	set_no_mwait, "IFL91 board", {
-	DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
-	DMI_MATCH(DMI_SYS_VENDOR, "ZEPTO"),
-	DMI_MATCH(DMI_PRODUCT_VERSION, "3215W"),
-	DMI_MATCH(DMI_BOARD_NAME, "IFL91") }, NULL},
 	{
 	set_no_mwait, "Extensa 5220", {
 	DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),

drivers/acpi/processor_driver.c+1−1

@@ -850,7 +850,7 @@ static int __init acpi_processor_init(void) · 849 unmodified lines
850	printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",	850	printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
851	acpi_idle_driver.name);	851	acpi_idle_driver.name);
852	} else {	852	} else {
853	printk(KERN_DEBUG "ACPI: acpi_idle yielding to %s",	853	printk(KERN_DEBUG "ACPI: acpi_idle yielding to %s\n",
854	cpuidle_get_driver()->name);	854	cpuidle_get_driver()->name);
855	}	855	}
856		856

drivers/acpi/processor_perflib.c+2−2

@@ -447,8 +447,8 @@ int acpi_processor_notify_smm(struct module *calling_module) · 446 unmodified lines
447	if (!try_module_get(calling_module))	447	if (!try_module_get(calling_module))
448	return -EINVAL;	448	return -EINVAL;
449		449
450	/* is_done is set to negative if an error occured,	450	/* is_done is set to negative if an error occurred,
451	* and to postitive if _no_ error occured, but SMM	451	* and to postitive if _no_ error occurred, but SMM
452	* was already notified. This avoids double notification	452	* was already notified. This avoids double notification
453	* which might lead to unexpected results...	453	* which might lead to unexpected results...
454	*/	454	*/

drivers/acpi/sleep.c+22−0

@@ -363,6 +363,12 @@ static int __init init_old_suspend_ordering(const struct dmi_system_id *d) · 362 unmodified lines
363	return 0;	363	return 0;
364	}	364	}
365		365
		366	static int __init init_nvs_nosave(const struct dmi_system_id *d)
		367	{
		368	acpi_nvs_nosave();
		369	return 0;
		370	}
		371
366	static struct dmi_system_id __initdata acpisleep_dmi_table[] = {	372	static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
367	{	373	{
368	.callback = init_old_suspend_ordering,	374	.callback = init_old_suspend_ordering,
@@ -397,6 +403,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { · 28 unmodified lines
397	DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),	403	DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),
398	},	404	},
399	},	405	},
		406	{
		407	.callback = init_nvs_nosave,
		408	.ident = "Sony Vaio VGN-SR11M",
		409	.matches = {
		410	DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
		411	DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR11M"),
		412	},
		413	},
		414	{
		415	.callback = init_nvs_nosave,
		416	.ident = "Everex StepNote Series",
		417	.matches = {
		418	DMI_MATCH(DMI_SYS_VENDOR, "Everex Systems, Inc."),
		419	DMI_MATCH(DMI_PRODUCT_NAME, "Everex StepNote Series"),
		420	},
		421	},
400	{},	422	{},
401	};	423	};
402	#endif /* CONFIG_SUSPEND */	424	#endif /* CONFIG_SUSPEND */

drivers/acpi/sysfs.c+14−6

 	ACPI_DEBUG_INIT(ACPI_LV_EVENTS),
 };
-static int param_get_debug_layer(char *buffer, struct kernel_param *kp)
+static int param_get_debug_layer(char *buffer, const struct kernel_param *kp)
 {
 	int result = 0;
 	int i;
 	return result;
 }
-static int param_get_debug_level(char *buffer, struct kernel_param *kp)
+static int param_get_debug_level(char *buffer, const struct kernel_param *kp)
 {
 	int result = 0;
 	int i;
 	return result;
 }
-module_param_call(debug_layer, param_set_uint, param_get_debug_layer,
+static struct kernel_param_ops param_ops_debug_layer = {
-		  &acpi_dbg_layer, 0644);
+	.set = param_set_uint,
-module_param_call(debug_level, param_set_uint, param_get_debug_level,
+	.get = param_get_debug_layer,
-		  &acpi_dbg_level, 0644);
+};
+static struct kernel_param_ops param_ops_debug_level = {
+	.set = param_set_uint,
+	.get = param_get_debug_level,
+};
+module_param_cb(debug_layer, &param_ops_debug_layer, &acpi_dbg_layer, 0644);
+module_param_cb(debug_level, &param_ops_debug_level, &acpi_dbg_level, 0644);
 static char trace_method_name[6];
 module_param_string(trace_method_name, trace_method_name, 6, 0644);

drivers/acpi/video_detect.c+2−2

@@ -59,8 +59,8 @@ acpi_backlight_cap_match(acpi_handle handle, u32 level, void *context, · 58 unmodified lines
59	"support\n"));	59	"support\n"));
60	*cap \|= ACPI_VIDEO_BACKLIGHT;	60	*cap \|= ACPI_VIDEO_BACKLIGHT;
61	if (ACPI_FAILURE(acpi_get_handle(handle, "_BQC", &h_dummy)))	61	if (ACPI_FAILURE(acpi_get_handle(handle, "_BQC", &h_dummy)))
62	printk(KERN_WARNING FW_BUG PREFIX "ACPI brightness "	62	printk(KERN_WARNING FW_BUG PREFIX "No _BQC method, "
63	"control misses _BQC function\n");	63	"cannot determine initial brightness\n");
64	/* We have backlight support, no need to scan further */	64	/* We have backlight support, no need to scan further */
65	return AE_CTRL_TERMINATE;	65	return AE_CTRL_TERMINATE;
66	}	66	}

drivers/ata/ahci.c+4−0

 static int ahci_pci_device_resume(struct pci_dev *pdev);
 #endif
+static struct scsi_host_template ahci_sht = {
+	AHCI_SHT("ahci"),
+};
 static struct ata_port_operations ahci_vt8251_ops = {
 	.inherits		= &ahci_ops,
 	.hardreset		= ahci_vt8251_hardreset,

drivers/ata/ahci.h+11−1

@@ -298,7 +298,17 @@ struct ahci_host_priv { · 297 unmodified lines
298		298
299	extern int ahci_ignore_sss;	299	extern int ahci_ignore_sss;
300		300
301	extern struct scsi_host_template ahci_sht;	301	extern struct device_attribute *ahci_shost_attrs[];
		302	extern struct device_attribute *ahci_sdev_attrs[];
		303
		304	#define AHCI_SHT(drv_name) \
		305	ATA_NCQ_SHT(drv_name), \
		306	.can_queue = AHCI_MAX_CMDS - 1, \
		307	.sg_tablesize = AHCI_MAX_SG, \
		308	.dma_boundary = AHCI_DMA_BOUNDARY, \
		309	.shost_attrs = ahci_shost_attrs, \
		310	.sdev_attrs = ahci_sdev_attrs
		311
302	extern struct ata_port_operations ahci_ops;	312	extern struct ata_port_operations ahci_ops;
303		313
304	void ahci_save_initial_config(struct device *dev,	314	void ahci_save_initial_config(struct device *dev,

drivers/ata/ahci_platform.c+5−1

 #include <linux/ahci_platform.h>
 #include "ahci.h"
+static struct scsi_host_template ahci_platform_sht = {
+	AHCI_SHT("ahci_platform"),
+};
 static int __init ahci_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	ahci_print_info(host, "platform");
 	rc = ata_host_activate(host, irq, ahci_interrupt, IRQF_SHARED,
-			       &ahci_sht);
+			       &ahci_platform_sht);
 	if (rc)
 		goto err0;

drivers/ata/libahci.c+4−12

@@ -121,7 +121,7 @@ static DEVICE_ATTR(ahci_port_cmd, S_IRUGO, ahci_show_port_cmd, NULL); · 120 unmodified lines
121	static DEVICE_ATTR(em_buffer, S_IWUSR \| S_IRUGO,	121	static DEVICE_ATTR(em_buffer, S_IWUSR \| S_IRUGO,
122	ahci_read_em_buffer, ahci_store_em_buffer);	122	ahci_read_em_buffer, ahci_store_em_buffer);
123		123
124	static struct device_attribute *ahci_shost_attrs[] = {	124	struct device_attribute *ahci_shost_attrs[] = {
125	&dev_attr_link_power_management_policy,	125	&dev_attr_link_power_management_policy,
126	&dev_attr_em_message_type,	126	&dev_attr_em_message_type,
127	&dev_attr_em_message,	127	&dev_attr_em_message,
@@ -132,22 +132,14 @@ static struct device_attribute *ahci_shost_attrs[] = { · 4 unmodified lines
132	&dev_attr_em_buffer,	132	&dev_attr_em_buffer,
133	NULL	133	NULL
134	};	134	};
		135	EXPORT_SYMBOL_GPL(ahci_shost_attrs);
135		136
136	static struct device_attribute *ahci_sdev_attrs[] = {	137	struct device_attribute *ahci_sdev_attrs[] = {
137	&dev_attr_sw_activity,	138	&dev_attr_sw_activity,
138	&dev_attr_unload_heads,	139	&dev_attr_unload_heads,
139	NULL	140	NULL
140	};	141	};
141		142	EXPORT_SYMBOL_GPL(ahci_sdev_attrs);
142	struct scsi_host_template ahci_sht = {
143	ATA_NCQ_SHT("ahci"),
144	.can_queue = AHCI_MAX_CMDS - 1,
145	.sg_tablesize = AHCI_MAX_SG,
146	.dma_boundary = AHCI_DMA_BOUNDARY,
147	.shost_attrs = ahci_shost_attrs,
148	.sdev_attrs = ahci_sdev_attrs,
149	};
150	EXPORT_SYMBOL_GPL(ahci_sht);
151		143
152	struct ata_port_operations ahci_ops = {	144	struct ata_port_operations ahci_ops = {
153	.inherits = &sata_pmp_port_ops,	145	.inherits = &sata_pmp_port_ops,

drivers/block/pktcdvd.c+1−1

@@ -2369,7 +2369,7 @@ static void pkt_release_dev(struct pktcdvd_device *pd, int flush) · 2368 unmodified lines
2369	pkt_shrink_pktlist(pd);	2369	pkt_shrink_pktlist(pd);
2370	}	2370	}
2371		2371
2372	static struct pktcdvd_device *pkt_find_dev_from_minor(int dev_minor)	2372	static struct pktcdvd_device *pkt_find_dev_from_minor(unsigned int dev_minor)
2373	{	2373	{
2374	if (dev_minor >= MAX_WRITERS)	2374	if (dev_minor >= MAX_WRITERS)
2375	return NULL;	2375	return NULL;

drivers/char/ipmi/ipmi_si_intf.c+11−6

 #ifdef CONFIG_PCI
 static int pci_registered;
 #endif
+#ifdef CONFIG_ACPI
+static int pnp_registered;
+#endif
 #ifdef CONFIG_PPC_OF
 static int of_registered;
 #endif
 {
 	struct acpi_device *acpi_dev;
 	struct smi_info *info;
-	struct resource *res;
+	struct resource *res, *res_second;
 	acpi_handle handle;
 	acpi_status status;
 	unsigned long long tmp;
 	info->io.addr_data = res->start;
 	info->io.regspacing = DEFAULT_REGSPACING;
-	res = pnp_get_resource(dev,
+	res_second = pnp_get_resource(dev,
 			       (info->io.addr_type == IPMI_IO_ADDR_SPACE) ?
 					IORESOURCE_IO : IORESOURCE_MEM,
 			       1);
-	if (res) {
+	if (res_second) {
-		if (res->start > info->io.addr_data)
+		if (res_second->start > info->io.addr_data)
-			info->io.regspacing = res->start - info->io.addr_data;
+			info->io.regspacing = res_second->start - info->io.addr_data;
 	}
 	info->io.regsize = DEFAULT_REGSPACING;
 	info->io.regshift = 0;
 #ifdef CONFIG_ACPI
 	pnp_register_driver(&ipmi_pnp_driver);
+	pnp_registered = 1;
 #endif
 #ifdef CONFIG_DMI
 		pci_unregister_driver(&ipmi_pci_driver);
 #endif
 #ifdef CONFIG_ACPI
-	pnp_unregister_driver(&ipmi_pnp_driver);
+	if (pnp_registered)
+		pnp_unregister_driver(&ipmi_pnp_driver);
 #endif
 #ifdef CONFIG_PPC_OF

drivers/cpuidle/governors/menu.c+1−1

@@ -80,7 +80,7 @@ · 79 unmodified lines
80	* Limiting Performance Impact	80	* Limiting Performance Impact
81	* ---------------------------	81	* ---------------------------
82	* C states, especially those with large exit latencies, can have a real	82	* C states, especially those with large exit latencies, can have a real
83	* noticable impact on workloads, which is not acceptable for most sysadmins,	83	* noticeable impact on workloads, which is not acceptable for most sysadmins,
84	* and in addition, less performance has a power price of its own.	84	* and in addition, less performance has a power price of its own.
85	*	85	*
86	* As a general rule of thumb, menu assumes that the following heuristic	86	* As a general rule of thumb, menu assumes that the following heuristic

drivers/dma/mv_xor.c+1−1

@@ -162,7 +162,7 @@ static int mv_is_err_intr(u32 intr_cause) · 161 unmodified lines
162		162
163	static void mv_xor_device_clear_eoc_cause(struct mv_xor_chan *chan)	163	static void mv_xor_device_clear_eoc_cause(struct mv_xor_chan *chan)
164	{	164	{
165	u32 val = (1 << (1 + (chan->idx * 16)));	165	u32 val = ~(1 << (chan->idx * 16));
166	dev_dbg(chan->device->common.dev, "%s, val 0x%08x\n", __func__, val);	166	dev_dbg(chan->device->common.dev, "%s, val 0x%08x\n", __func__, val);
167	__raw_writel(val, XOR_INTR_CAUSE(chan));	167	__raw_writel(val, XOR_INTR_CAUSE(chan));
168	}	168	}

drivers/dma/shdma.c+2−1

 	sh_chan = to_sh_chan(chan);
 	param = chan->private;
-	slave_addr = param->config->addr;
 	/* Someone calling slave DMA on a public channel? */
 	if (!param || !sg_len) {
 		return NULL;
 	}
+	slave_addr = param->config->addr;
 	/*
 	 * if (param != NULL), this is a successfully requested slave channel,
 	 * therefore param->config != NULL too.

drivers/edac/edac_mc.c+3−0

@@ -339,6 +339,9 @@ static void edac_mc_workq_teardown(struct mem_ctl_info *mci) · 338 unmodified lines
339	{	339	{
340	int status;	340	int status;
341		341
		342	if (mci->op_state != OP_RUNNING_POLL)
		343	return;
		344
342	status = cancel_delayed_work(&mci->work);	345	status = cancel_delayed_work(&mci->work);
343	if (status == 0) {	346	if (status == 0) {
344	debugf0("%s() not canceled, flush the queue\n",	347	debugf0("%s() not canceled, flush the queue\n",

drivers/edac/i7core_edac.c+1−0

@@ -1140,6 +1140,7 @@ static struct mcidev_sysfs_attribute i7core_udimm_counters_attrs[] = { · 1139 unmodified lines
1140	ATTR_COUNTER(0),	1140	ATTR_COUNTER(0),
1141	ATTR_COUNTER(1),	1141	ATTR_COUNTER(1),
1142	ATTR_COUNTER(2),	1142	ATTR_COUNTER(2),
		1143	{ .attr = { .name = NULL } }
1143	};	1144	};
1144		1145
1145	static struct mcidev_sysfs_group i7core_udimm_counters = {	1146	static struct mcidev_sysfs_group i7core_udimm_counters = {

drivers/gpu/drm/drm_buffer.c+3−3

@@ -98,8 +98,8 @@ EXPORT_SYMBOL(drm_buffer_alloc); · 97 unmodified lines
98	* user_data: A pointer the data that is copied to the buffer.	98	* user_data: A pointer the data that is copied to the buffer.
99	* size: The Number of bytes to copy.	99	* size: The Number of bytes to copy.
100	*/	100	*/
101	extern int drm_buffer_copy_from_user(struct drm_buffer *buf,	101	int drm_buffer_copy_from_user(struct drm_buffer *buf,
102	void __user *user_data, int size)	102	void __user *user_data, int size)
103	{	103	{
104	int nr_pages = size / PAGE_SIZE + 1;	104	int nr_pages = size / PAGE_SIZE + 1;
105	int idx;	105	int idx;
@@ -163,7 +163,7 @@ void drm_buffer_read_object(struct drm_buffer buf, · 57 unmodified lines
163	{	163	{
164	int idx = drm_buffer_index(buf);	164	int idx = drm_buffer_index(buf);
165	int page = drm_buffer_page(buf);	165	int page = drm_buffer_page(buf);
166	void *obj = 0;	166	void *obj = NULL;
167		167
168	if (idx + objsize <= PAGE_SIZE) {	168	if (idx + objsize <= PAGE_SIZE) {
169	obj = &buf->data[page][idx];	169	obj = &buf->data[page][idx];

drivers/gpu/drm/drm_gem.c+10−29

 		return -ENOMEM;
 	kref_init(&obj->refcount);
-	kref_init(&obj->handlecount);
+	atomic_set(&obj->handle_count, 0);
 	obj->size = size;
 	atomic_inc(&dev->object_count);
 }
 EXPORT_SYMBOL(drm_gem_object_free);
-/**
- * Called after the last reference to the object has been lost.
- * Must be called without holding struct_mutex
- *
- * Frees the object
- */
-void
-drm_gem_object_free_unlocked(struct kref *kref)
-{
-	struct drm_gem_object *obj = (struct drm_gem_object *) kref;
-	struct drm_device *dev = obj->dev;
-	if (dev->driver->gem_free_object_unlocked != NULL)
-		dev->driver->gem_free_object_unlocked(obj);
-	else if (dev->driver->gem_free_object != NULL) {
-		mutex_lock(&dev->struct_mutex);
-		dev->driver->gem_free_object(obj);
-		mutex_unlock(&dev->struct_mutex);
-	}
-}
-EXPORT_SYMBOL(drm_gem_object_free_unlocked);
 static void drm_gem_object_ref_bug(struct kref *list_kref)
 {
 	BUG();
  * called before drm_gem_object_free or we'll be touching
  * freed memory
  */
-void
+void drm_gem_object_handle_free(struct drm_gem_object *obj)
-drm_gem_object_handle_free(struct kref *kref)
 {
-	struct drm_gem_object *obj = container_of(kref,
-						  struct drm_gem_object,
-						  handlecount);
 	struct drm_device *dev = obj->dev;
 	/* Remove any name for this object */
 	struct drm_gem_object *obj = vma->vm_private_data;
 	drm_gem_object_reference(obj);
+	mutex_lock(&obj->dev->struct_mutex);
+	drm_vm_open_locked(vma);
+	mutex_unlock(&obj->dev->struct_mutex);
 }
 EXPORT_SYMBOL(drm_gem_vm_open);
 {
 	struct drm_gem_object *obj = vma->vm_private_data;
-	drm_gem_object_unreference_unlocked(obj);
+	mutex_lock(&obj->dev->struct_mutex);
+	drm_vm_close_locked(vma);
+	drm_gem_object_unreference(obj);
+	mutex_unlock(&obj->dev->struct_mutex);
 }
 EXPORT_SYMBOL(drm_gem_vm_close);

drivers/gpu/drm/drm_info.c+1−1

@@ -255,7 +255,7 @@ int drm_gem_one_name_info(int id, void ptr, void data) · 254 unmodified lines
255		255
256	seq_printf(m, "%6d %8zd %7d %8d\n",	256	seq_printf(m, "%6d %8zd %7d %8d\n",
257	obj->name, obj->size,	257	obj->name, obj->size,
258	atomic_read(&obj->handlecount.refcount),	258	atomic_read(&obj->handle_count),
259	atomic_read(&obj->refcount.refcount));	259	atomic_read(&obj->refcount.refcount));
260	return 0;	260	return 0;
261	}	261	}

drivers/gpu/drm/drm_vm.c+18−10

 	mutex_unlock(&dev->struct_mutex);
 }
-/**
+void drm_vm_close_locked(struct vm_area_struct *vma)
- * \c close method for all virtual memory types.
- *
- * \param vma virtual memory area.
- *
- * Search the \p vma private data entry in drm_device::vmalist, unlink it, and
- * free it.
- */
-static void drm_vm_close(struct vm_area_struct *vma)
 {
 	struct drm_file *priv = vma->vm_file->private_data;
 	struct drm_device *dev = priv->minor->dev;
 		  vma->vm_start, vma->vm_end - vma->vm_start);
 	atomic_dec(&dev->vma_count);
-	mutex_lock(&dev->struct_mutex);
 	list_for_each_entry_safe(pt, temp, &dev->vmalist, head) {
 		if (pt->vma == vma) {
 			list_del(&pt->head);
 			break;
 		}
 	}
+}
+/**
+ * \c close method for all virtual memory types.
+ *
+ * \param vma virtual memory area.
+ *
+ * Search the \p vma private data entry in drm_device::vmalist, unlink it, and
+ * free it.
+ */
+static void drm_vm_close(struct vm_area_struct *vma)
+{
+	struct drm_file *priv = vma->vm_file->private_data;
+	struct drm_device *dev = priv->minor->dev;
+	mutex_lock(&dev->struct_mutex);
+	drm_vm_close_locked(vma);
 	mutex_unlock(&dev->struct_mutex);
 }

drivers/gpu/drm/i810/i810_dma.c+1−1

@@ -116,7 +116,7 @@ static int i810_mmap_buffers(struct file filp, struct vm_area_struct vma) · 115 unmodified lines
116	static const struct file_operations i810_buffer_fops = {	116	static const struct file_operations i810_buffer_fops = {
117	.open = drm_open,	117	.open = drm_open,
118	.release = drm_release,	118	.release = drm_release,
119	.unlocked_ioctl = drm_ioctl,	119	.unlocked_ioctl = i810_ioctl,
120	.mmap = i810_mmap_buffers,	120	.mmap = i810_mmap_buffers,
121	.fasync = drm_fasync,	121	.fasync = drm_fasync,
122	};	122	};

drivers/gpu/drm/i830/i830_dma.c+1−1

@@ -118,7 +118,7 @@ static int i830_mmap_buffers(struct file filp, struct vm_area_struct vma) · 117 unmodified lines
118	static const struct file_operations i830_buffer_fops = {	118	static const struct file_operations i830_buffer_fops = {
119	.open = drm_open,	119	.open = drm_open,
120	.release = drm_release,	120	.release = drm_release,
121	.unlocked_ioctl = drm_ioctl,	121	.unlocked_ioctl = i830_ioctl,
122	.mmap = i830_mmap_buffers,	122	.mmap = i830_mmap_buffers,
123	.fasync = drm_fasync,	123	.fasync = drm_fasync,
124	};	124	};

drivers/gpu/drm/i915/i915_dma.c+3−3

@@ -1787,9 +1787,9 @@ unsigned long i915_chipset_val(struct drm_i915_private *dev_priv) · 1786 unmodified lines
1787	}	1787	}
1788	}	1788	}
1789		1789
1790	div_u64(diff, diff1);	1790	diff = div_u64(diff, diff1);
1791	ret = ((m * diff) + c);	1791	ret = ((m * diff) + c);
1792	div_u64(ret, 10);	1792	ret = div_u64(ret, 10);
1793		1793
1794	dev_priv->last_count1 = total_count;	1794	dev_priv->last_count1 = total_count;
1795	dev_priv->last_time1 = now;	1795	dev_priv->last_time1 = now;
@@ -1858,7 +1858,7 @@ void i915_update_gfx_val(struct drm_i915_private *dev_priv) · 62 unmodified lines
1858		1858
1859	/* More magic constants... */	1859	/* More magic constants... */
1860	diff = diff * 1181;	1860	diff = diff * 1181;
1861	div_u64(diff, diffms * 10);	1861	diff = div_u64(diff, diffms * 10);
1862	dev_priv->gfx_power = diff;	1862	dev_priv->gfx_power = diff;
1863	}	1863	}
1864		1864

drivers/gpu/drm/i915/i915_gem.c+29−25

@@ -136,14 +136,12 @@ i915_gem_create_ioctl(struct drm_device dev, void data, · 135 unmodified lines
136	return -ENOMEM;	136	return -ENOMEM;
137		137
138	ret = drm_gem_handle_create(file_priv, obj, &handle);	138	ret = drm_gem_handle_create(file_priv, obj, &handle);
		139	/* drop reference from allocate - handle holds it now */
		140	drm_gem_object_unreference_unlocked(obj);
139	if (ret) {	141	if (ret) {
140	drm_gem_object_unreference_unlocked(obj);
141	return ret;	142	return ret;
142	}	143	}
143		144
144	/* Sink the floating reference from kref_init(handlecount) */
145	drm_gem_object_handle_unreference_unlocked(obj);
146
147	args->handle = handle;	145	args->handle = handle;
148	return 0;	146	return 0;
149	}	147	}
@@ -471,14 +469,17 @@ i915_gem_pread_ioctl(struct drm_device dev, void data, · 321 unmodified lines
471	return -ENOENT;	469	return -ENOENT;
472	obj_priv = to_intel_bo(obj);	470	obj_priv = to_intel_bo(obj);
473		471
474	/* Bounds check source.	472	/* Bounds check source. */
475	*	473	if (args->offset > obj->size \|\| args->size > obj->size - args->offset) {
476	* XXX: This could use review for overflow issues...	474	ret = -EINVAL;
477	*/	475	goto err;
478	if (args->offset > obj->size \|\| args->size > obj->size \|\|	476	}
479	args->offset + args->size > obj->size) {	477
480	drm_gem_object_unreference_unlocked(obj);	478	if (!access_ok(VERIFY_WRITE,
481	return -EINVAL;	479	(char __user *)(uintptr_t)args->data_ptr,
		480	args->size)) {
		481	ret = -EFAULT;
		482	goto err;
482	}	483	}
483		484
484	if (i915_gem_object_needs_bit17_swizzle(obj)) {	485	if (i915_gem_object_needs_bit17_swizzle(obj)) {
@@ -490,8 +491,8 @@ i915_gem_pread_ioctl(struct drm_device dev, void data, · 5 unmodified lines
490	file_priv);	491	file_priv);
491	}	492	}
492		493
		494	err:
493	drm_gem_object_unreference_unlocked(obj);	495	drm_gem_object_unreference_unlocked(obj);
494
495	return ret;	496	return ret;
496	}	497	}
497		498
@@ -580,8 +581,6 @@ i915_gem_gtt_pwrite_fast(struct drm_device dev, struct drm_gem_object obj, · 82 unmodified lines
580		581
581	user_data = (char __user *) (uintptr_t) args->data_ptr;	582	user_data = (char __user *) (uintptr_t) args->data_ptr;
582	remain = args->size;	583	remain = args->size;
583	if (!access_ok(VERIFY_READ, user_data, remain))
584	return -EFAULT;
585		584
586		585
587	mutex_lock(&dev->struct_mutex);	586	mutex_lock(&dev->struct_mutex);
@@ -934,14 +933,17 @@ i915_gem_pwrite_ioctl(struct drm_device dev, void data, · 346 unmodified lines
934	return -ENOENT;	933	return -ENOENT;
935	obj_priv = to_intel_bo(obj);	934	obj_priv = to_intel_bo(obj);
936		935
937	/* Bounds check destination.	936	/* Bounds check destination. */
938	*	937	if (args->offset > obj->size \|\| args->size > obj->size - args->offset) {
939	* XXX: This could use review for overflow issues...	938	ret = -EINVAL;
940	*/	939	goto err;
941	if (args->offset > obj->size \|\| args->size > obj->size \|\|	940	}
942	args->offset + args->size > obj->size) {	941
943	drm_gem_object_unreference_unlocked(obj);	942	if (!access_ok(VERIFY_READ,
944	return -EINVAL;	943	(char __user *)(uintptr_t)args->data_ptr,
		944	args->size)) {
		945	ret = -EFAULT;
		946	goto err;
945	}	947	}
946		948
947	/* We can only do the GTT pwrite on untiled buffers, as otherwise	949	/* We can only do the GTT pwrite on untiled buffers, as otherwise
@@ -975,8 +977,8 @@ i915_gem_pwrite_ioctl(struct drm_device dev, void data, · 27 unmodified lines
975	DRM_INFO("pwrite failed %d\n", ret);	977	DRM_INFO("pwrite failed %d\n", ret);
976	#endif	978	#endif
977		979
		980	err:
978	drm_gem_object_unreference_unlocked(obj);	981	drm_gem_object_unreference_unlocked(obj);
979
980	return ret;	982	return ret;
981	}	983	}
982		984
@@ -2400,7 +2402,7 @@ i915_gem_clear_fence_reg(struct drm_gem_object *obj) · 1417 unmodified lines
2400	I915_WRITE64(FENCE_REG_965_0 + (obj_priv->fence_reg * 8), 0);	2402	I915_WRITE64(FENCE_REG_965_0 + (obj_priv->fence_reg * 8), 0);
2401	break;	2403	break;
2402	case 3:	2404	case 3:
2403	if (obj_priv->fence_reg > 8)	2405	if (obj_priv->fence_reg >= 8)
2404	fence_reg = FENCE_REG_945_8 + (obj_priv->fence_reg - 8) * 4;	2406	fence_reg = FENCE_REG_945_8 + (obj_priv->fence_reg - 8) * 4;
2405	else	2407	else
2406	case 2:	2408	case 2:
@@ -3258,6 +3260,8 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, · 851 unmodified lines
3258	(int) reloc->offset,	3260	(int) reloc->offset,
3259	reloc->read_domains,	3261	reloc->read_domains,
3260	reloc->write_domain);	3262	reloc->write_domain);
		3263	drm_gem_object_unreference(target_obj);
		3264	i915_gem_object_unpin(obj);
3261	return -EINVAL;	3265	return -EINVAL;
3262	}	3266	}
3263	if (reloc->write_domain & I915_GEM_DOMAIN_CPU \|\|	3267	if (reloc->write_domain & I915_GEM_DOMAIN_CPU \|\|

drivers/gpu/drm/i915/i915_gem_evict.c+20−25

 {
 	drm_i915_private_t *dev_priv = dev->dev_private;
 	struct list_head eviction_list, unwind_list;
-	struct drm_i915_gem_object *obj_priv, *tmp_obj_priv;
+	struct drm_i915_gem_object *obj_priv;
 	struct list_head *render_iter, *bsd_iter;
 	int ret = 0;
 	return -ENOSPC;
 found:
+	/* drm_mm doesn't allow any other other operations while
+	 * scanning, therefore store to be evicted objects on a
+	 * temporary list. */
 	INIT_LIST_HEAD(&eviction_list);
-	list_for_each_entry_safe(obj_priv, tmp_obj_priv,
+	while (!list_empty(&unwind_list)) {
-				 &unwind_list, evict_list) {
+		obj_priv = list_first_entry(&unwind_list,
+					    struct drm_i915_gem_object,
+					    evict_list);
 		if (drm_mm_scan_remove_block(obj_priv->gtt_space)) {
-			/* drm_mm doesn't allow any other other operations while
-			 * scanning, therefore store to be evicted objects on a
-			 * temporary list. */
 			list_move(&obj_priv->evict_list, &eviction_list);
-		} else
+			continue;
-			drm_gem_object_unreference(&obj_priv->base);
+		}
+		list_del(&obj_priv->evict_list);
+		drm_gem_object_unreference(&obj_priv->base);
 	}
 	/* Unbinding will emit any required flushes */
-	list_for_each_entry_safe(obj_priv, tmp_obj_priv,
+	while (!list_empty(&eviction_list)) {
-				 &eviction_list, evict_list) {
+		obj_priv = list_first_entry(&eviction_list,
-#if WATCH_LRU
+					    struct drm_i915_gem_object,
-		DRM_INFO("%s: evicting %p\n", __func__, &obj_priv->base);
+					    evict_list);
-#endif
+		if (ret == 0)
-		ret = i915_gem_object_unbind(&obj_priv->base);
+			ret = i915_gem_object_unbind(&obj_priv->base);
-		if (ret)
+		list_del(&obj_priv->evict_list);
-			return ret;
 		drm_gem_object_unreference(&obj_priv->base);
 	}
-	/* The just created free hole should be on the top of the free stack
+	return ret;
-	 * maintained by drm_mm, so this BUG_ON actually executes in O(1).
-	 * Furthermore all accessed data has just recently been used, so it
-	 * should be really fast, too. */
-	BUG_ON(!drm_mm_search_free(&dev_priv->mm.gtt_space, min_size,
-				   alignment, 0));
-	return 0;
 }
 int

drivers/gpu/drm/i915/intel_display.c+38−24

@@ -1013,8 +1013,8 @@ void intel_wait_for_vblank(struct drm_device *dev, int pipe) · 1012 unmodified lines
1013	DRM_DEBUG_KMS("vblank wait timed out\n");	1013	DRM_DEBUG_KMS("vblank wait timed out\n");
1014	}	1014	}
1015		1015
1016	/**	1016	/*
1017	* intel_wait_for_vblank_off - wait for vblank after disabling a pipe	1017	* intel_wait_for_pipe_off - wait for pipe to turn off
1018	* @dev: drm device	1018	* @dev: drm device
1019	* @pipe: pipe to wait for	1019	* @pipe: pipe to wait for
1020	*	1020	*
@@ -1022,25 +1022,39 @@ void intel_wait_for_vblank(struct drm_device *dev, int pipe) · 1 unmodified line
1022	* spinning on the vblank interrupt status bit, since we won't actually	1022	* spinning on the vblank interrupt status bit, since we won't actually
1023	* see an interrupt when the pipe is disabled.	1023	* see an interrupt when the pipe is disabled.
1024	*	1024	*
1025	* So this function waits for the display line value to settle (it	1025	* On Gen4 and above:
1026	* usually ends up stopping at the start of the next frame).	1026	* wait for the pipe register state bit to turn off
		1027	*
		1028	* Otherwise:
		1029	* wait for the display line value to settle (it usually
		1030	* ends up stopping at the start of the next frame).
		1031	*
1027	*/	1032	*/
1028	void intel_wait_for_vblank_off(struct drm_device *dev, int pipe)	1033	static void intel_wait_for_pipe_off(struct drm_device *dev, int pipe)
1029	{	1034	{
1030	struct drm_i915_private *dev_priv = dev->dev_private;	1035	struct drm_i915_private *dev_priv = dev->dev_private;
1031	int pipedsl_reg = (pipe == 0 ? PIPEADSL : PIPEBDSL);	1036
1032	unsigned long timeout = jiffies + msecs_to_jiffies(100);	1037	if (INTEL_INFO(dev)->gen >= 4) {
1033	u32 last_line;	1038	int pipeconf_reg = (pipe == 0 ? PIPEACONF : PIPEBCONF);
1034		1039
1035	/* Wait for the display line to settle */	1040	/* Wait for the Pipe State to go off */
1036	do {	1041	if (wait_for((I915_READ(pipeconf_reg) & I965_PIPECONF_ACTIVE) == 0,
1037	last_line = I915_READ(pipedsl_reg) & DSL_LINEMASK;	1042	100, 0))
1038	mdelay(5);	1043	DRM_DEBUG_KMS("pipe_off wait timed out\n");
1039	} while (((I915_READ(pipedsl_reg) & DSL_LINEMASK) != last_line) &&	1044	} else {
1040	time_after(timeout, jiffies));	1045	u32 last_line;
1041		1046	int pipedsl_reg = (pipe == 0 ? PIPEADSL : PIPEBDSL);
1042	if (time_after(jiffies, timeout))	1047	unsigned long timeout = jiffies + msecs_to_jiffies(100);
1043	DRM_DEBUG_KMS("vblank wait timed out\n");	1048
		1049	/* Wait for the display line to settle */
		1050	do {
		1051	last_line = I915_READ(pipedsl_reg) & DSL_LINEMASK;
		1052	mdelay(5);
		1053	} while (((I915_READ(pipedsl_reg) & DSL_LINEMASK) != last_line) &&
		1054	time_after(timeout, jiffies));
		1055	if (time_after(jiffies, timeout))
		1056	DRM_DEBUG_KMS("pipe_off wait timed out\n");
		1057	}
1044	}	1058	}
1045		1059
1046	/* Parameters have changed, update FBC info */	1060	/* Parameters have changed, update FBC info */
@@ -2328,13 +2342,13 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode) · 1281 unmodified lines
2328	I915_READ(dspbase_reg);	2342	I915_READ(dspbase_reg);
2329	}	2343	}
2330		2344
2331	/* Wait for vblank for the disable to take effect */
2332	intel_wait_for_vblank_off(dev, pipe);
2333
2334	/* Don't disable pipe A or pipe A PLLs if needed */	2345	/* Don't disable pipe A or pipe A PLLs if needed */
2335	if (pipeconf_reg == PIPEACONF &&	2346	if (pipeconf_reg == PIPEACONF &&
2336	(dev_priv->quirks & QUIRK_PIPEA_FORCE))	2347	(dev_priv->quirks & QUIRK_PIPEA_FORCE)) {
		2348	/* Wait for vblank for the disable to take effect */
		2349	intel_wait_for_vblank(dev, pipe);
2337	goto skip_pipe_off;	2350	goto skip_pipe_off;
		2351	}
2338		2352
2339	/* Next, disable display pipes */	2353	/* Next, disable display pipes */
2340	temp = I915_READ(pipeconf_reg);	2354	temp = I915_READ(pipeconf_reg);
@@ -2343,8 +2357,8 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode) · 2 unmodified lines
2343	I915_READ(pipeconf_reg);	2357	I915_READ(pipeconf_reg);
2344	}	2358	}
2345		2359
2346	/* Wait for vblank for the disable to take effect. */	2360	/* Wait for the pipe to turn off */
2347	intel_wait_for_vblank_off(dev, pipe);	2361	intel_wait_for_pipe_off(dev, pipe);
2348		2362
2349	temp = I915_READ(dpll_reg);	2363	temp = I915_READ(dpll_reg);
2350	if ((temp & DPLL_VCO_ENABLE) != 0) {	2364	if ((temp & DPLL_VCO_ENABLE) != 0) {

drivers/gpu/drm/i915/intel_dp.c+9−10

 intel_dp_set_link_train(struct intel_dp *intel_dp,
 			uint32_t dp_reg_value,
 			uint8_t dp_train_pat,
-			uint8_t train_set[4],
+			uint8_t train_set[4])
-			bool first)
 {
 	struct drm_device *dev = intel_dp->base.enc.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct intel_crtc *intel_crtc = to_intel_crtc(intel_dp->base.enc.crtc);
 	int ret;
 	I915_WRITE(intel_dp->output_reg, dp_reg_value);
 	POSTING_READ(intel_dp->output_reg);
-	if (first)
-		intel_wait_for_vblank(dev, intel_crtc->pipe);
 	intel_dp_aux_native_write_1(intel_dp,
 				    DP_TRAINING_PATTERN_SET,
 	uint8_t voltage;
 	bool clock_recovery = false;
 	bool channel_eq = false;
-	bool first = true;
 	int tries;
 	u32 reg;
 	uint32_t DP = intel_dp->DP;
+	struct intel_crtc *intel_crtc = to_intel_crtc(intel_dp->base.enc.crtc);
+	/* Enable output, wait for it to become active */
+	I915_WRITE(intel_dp->output_reg, intel_dp->DP);
+	POSTING_READ(intel_dp->output_reg);
+	intel_wait_for_vblank(dev, intel_crtc->pipe);
 	/* Write the link configuration data */
 	intel_dp_aux_native_write(intel_dp, DP_LINK_BW_SET,
 			reg = DP | DP_LINK_TRAIN_PAT_1;
 		if (!intel_dp_set_link_train(intel_dp, reg,
-					     DP_TRAINING_PATTERN_1, train_set, first))
+					     DP_TRAINING_PATTERN_1, train_set))
 			break;
-		first = false;
 		/* Set training pattern 1 */
 		udelay(100);
 		/* channel eq pattern */
 		if (!intel_dp_set_link_train(intel_dp, reg,
-					     DP_TRAINING_PATTERN_2, train_set,
+					     DP_TRAINING_PATTERN_2, train_set))
-					     false))
 			break;
 		udelay(400);

drivers/gpu/drm/i915/intel_drv.h+0−1

@@ -229,7 +229,6 @@ extern struct drm_display_mode intel_crtc_mode_get(struct drm_device dev, · 228 unmodified lines
229	struct drm_crtc *crtc);	229	struct drm_crtc *crtc);
230	int intel_get_pipe_from_crtc_id(struct drm_device dev, void data,	230	int intel_get_pipe_from_crtc_id(struct drm_device dev, void data,
231	struct drm_file *file_priv);	231	struct drm_file *file_priv);
232	extern void intel_wait_for_vblank_off(struct drm_device *dev, int pipe);
233	extern void intel_wait_for_vblank(struct drm_device *dev, int pipe);	232	extern void intel_wait_for_vblank(struct drm_device *dev, int pipe);
234	extern struct drm_crtc intel_get_crtc_from_pipe(struct drm_device dev, int pipe);	233	extern struct drm_crtc intel_get_crtc_from_pipe(struct drm_device dev, int pipe);
235	extern struct drm_crtc intel_get_load_detect_pipe(struct intel_encoder intel_encoder,	234	extern struct drm_crtc intel_get_load_detect_pipe(struct intel_encoder intel_encoder,

drivers/gpu/drm/i915/intel_fb.c+3−1

 	drm_fb_helper_fini(&ifbdev->helper);
 	drm_framebuffer_cleanup(&ifb->base);
-	if (ifb->obj)
+	if (ifb->obj) {
+		drm_gem_object_handle_unreference(ifb->obj);
 		drm_gem_object_unreference(ifb->obj);
+	}
 	return 0;
 }

drivers/gpu/drm/i915/intel_sdvo.c+6−9

         return true;
 err:
-	intel_sdvo_destroy_enhance_property(connector);
+	intel_sdvo_destroy(connector);
-	kfree(intel_sdvo_connector);
 	return false;
 }
 	return true;
 err:
-	intel_sdvo_destroy_enhance_property(connector);
+	intel_sdvo_destroy(connector);
-	kfree(intel_sdvo_connector);
 	return false;
 }
 		uint16_t response;
 	} enhancements;
-	if (!intel_sdvo_get_value(intel_sdvo,
+	enhancements.response = 0;
-				  SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS,
+	intel_sdvo_get_value(intel_sdvo,
-				  &enhancements, sizeof(enhancements)))
+			     SDVO_CMD_GET_SUPPORTED_ENHANCEMENTS,
-		return false;
+			     &enhancements, sizeof(enhancements));
 	if (enhancements.response == 0) {
 		DRM_DEBUG_KMS("No enhancement is supported\n");
 		return true;

drivers/gpu/drm/nouveau/nouveau_connector.c+4−2

@@ -558,8 +558,10 @@ nouveau_connector_get_modes(struct drm_connector *connector) · 557 unmodified lines
558	if (nv_encoder->dcb->type == OUTPUT_LVDS &&	558	if (nv_encoder->dcb->type == OUTPUT_LVDS &&
559	(nv_encoder->dcb->lvdsconf.use_straps_for_mode \|\|	559	(nv_encoder->dcb->lvdsconf.use_straps_for_mode \|\|
560	dev_priv->vbios.fp_no_ddc) && nouveau_bios_fp_mode(dev, NULL)) {	560	dev_priv->vbios.fp_no_ddc) && nouveau_bios_fp_mode(dev, NULL)) {
561	nv_connector->native_mode = drm_mode_create(dev);	561	struct drm_display_mode mode;
562	nouveau_bios_fp_mode(dev, nv_connector->native_mode);	562
		563	nouveau_bios_fp_mode(dev, &mode);
		564	nv_connector->native_mode = drm_mode_duplicate(dev, &mode);
563	}	565	}
564		566
565	/* Find the native mode if this is a digital panel, if we didn't	567	/* Find the native mode if this is a digital panel, if we didn't

drivers/gpu/drm/nouveau/nouveau_fbcon.c+1−0

@@ -352,6 +352,7 @@ nouveau_fbcon_destroy(struct drm_device dev, struct nouveau_fbdev nfbdev) · 351 unmodified lines
352		352
353	if (nouveau_fb->nvbo) {	353	if (nouveau_fb->nvbo) {
354	nouveau_bo_unmap(nouveau_fb->nvbo);	354	nouveau_bo_unmap(nouveau_fb->nvbo);
		355	drm_gem_object_handle_unreference_unlocked(nouveau_fb->nvbo->gem);
355	drm_gem_object_unreference_unlocked(nouveau_fb->nvbo->gem);	356	drm_gem_object_unreference_unlocked(nouveau_fb->nvbo->gem);
356	nouveau_fb->nvbo = NULL;	357	nouveau_fb->nvbo = NULL;
357	}	358	}

drivers/gpu/drm/nouveau/nouveau_gem.c+2−4

 		goto out;
 	ret = drm_gem_handle_create(file_priv, nvbo->gem, &req->info.handle);
+	/* drop reference from allocate - handle holds it now */
+	drm_gem_object_unreference_unlocked(nvbo->gem);
 out:
-	drm_gem_object_handle_unreference_unlocked(nvbo->gem);
-	if (ret)
-		drm_gem_object_unreference_unlocked(nvbo->gem);
 	return ret;
 }

drivers/gpu/drm/nouveau/nouveau_notifier.c+1−0

@@ -79,6 +79,7 @@ nouveau_notifier_takedown_channel(struct nouveau_channel *chan) · 78 unmodified lines
79	mutex_lock(&dev->struct_mutex);	79	mutex_lock(&dev->struct_mutex);
80	nouveau_bo_unpin(chan->notifier_bo);	80	nouveau_bo_unpin(chan->notifier_bo);
81	mutex_unlock(&dev->struct_mutex);	81	mutex_unlock(&dev->struct_mutex);
		82	drm_gem_object_handle_unreference_unlocked(chan->notifier_bo->gem);
82	drm_gem_object_unreference_unlocked(chan->notifier_bo->gem);	83	drm_gem_object_unreference_unlocked(chan->notifier_bo->gem);
83	drm_mm_takedown(&chan->notifier_heap);	84	drm_mm_takedown(&chan->notifier_heap);
84	}	85	}

drivers/gpu/drm/radeon/atombios.h+1−1

@@ -4999,7 +4999,7 @@ typedef struct _SW_I2C_IO_DATA_PARAMETERS · 4998 unmodified lines
4999	#define SW_I2C_CNTL_WRITE1BIT 6	4999	#define SW_I2C_CNTL_WRITE1BIT 6
5000		5000
5001	//==============================VESA definition Portion===============================	5001	//==============================VESA definition Portion===============================
5002	#define VESA_OEM_PRODUCT_REV '01.00'	5002	#define VESA_OEM_PRODUCT_REV "01.00"
5003	#define VESA_MODE_ATTRIBUTE_MODE_SUPPORT 0xBB //refer to VBE spec p.32, no TTY support	5003	#define VESA_MODE_ATTRIBUTE_MODE_SUPPORT 0xBB //refer to VBE spec p.32, no TTY support
5004	#define VESA_MODE_WIN_ATTRIBUTE 7	5004	#define VESA_MODE_WIN_ATTRIBUTE 7
5005	#define VESA_WIN_SIZE 64	5005	#define VESA_WIN_SIZE 64

drivers/gpu/drm/radeon/r600.c+3−2

 	if (i < rdev->usec_timeout) {
 		DRM_INFO("ib test succeeded in %u usecs\n", i);
 	} else {
-		DRM_ERROR("radeon: ib test failed (sracth(0x%04X)=0x%08X)\n",
+		DRM_ERROR("radeon: ib test failed (scratch(0x%04X)=0x%08X)\n",
 			  scratch, tmp);
 		r = -EINVAL;
 	}
 	/* r7xx hw bug.  write to HDP_DEBUG1 followed by fb read
 	 * rather than write to HDP_REG_COHERENCY_FLUSH_CNTL
 	 */
-	if ((rdev->family >= CHIP_RV770) && (rdev->family <= CHIP_RV740)) {
+	if ((rdev->family >= CHIP_RV770) && (rdev->family <= CHIP_RV740) &&
+	    rdev->vram_scratch.ptr) {
 		void __iomem *ptr = (void *)rdev->vram_scratch.ptr;
 		u32 tmp;

drivers/gpu/drm/radeon/radeon_atombios.c+9−0

@@ -317,6 +317,15 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, · 316 unmodified lines
317	*connector_type = DRM_MODE_CONNECTOR_DVID;	317	*connector_type = DRM_MODE_CONNECTOR_DVID;
318	}	318	}
319		319
		320	/* MSI K9A2GM V2/V3 board has no HDMI or DVI */
		321	if ((dev->pdev->device == 0x796e) &&
		322	(dev->pdev->subsystem_vendor == 0x1462) &&
		323	(dev->pdev->subsystem_device == 0x7302)) {
		324	if ((supported_device == ATOM_DEVICE_DFP2_SUPPORT) \|\|
		325	(supported_device == ATOM_DEVICE_DFP3_SUPPORT))
		326	return false;
		327	}
		328
320	/* a-bit f-i90hd - ciaranm on #radeonhd - this board has no DVI */	329	/* a-bit f-i90hd - ciaranm on #radeonhd - this board has no DVI */
321	if ((dev->pdev->device == 0x7941) &&	330	if ((dev->pdev->device == 0x7941) &&
322	(dev->pdev->subsystem_vendor == 0x147b) &&	331	(dev->pdev->subsystem_vendor == 0x147b) &&

drivers/gpu/drm/radeon/radeon_display.c+4−1

 					DRM_INFO("    DFP4: %s\n", encoder_names[radeon_encoder->encoder_id]);
 				if (devices & ATOM_DEVICE_DFP5_SUPPORT)
 					DRM_INFO("    DFP5: %s\n", encoder_names[radeon_encoder->encoder_id]);
+				if (devices & ATOM_DEVICE_DFP6_SUPPORT)
+					DRM_INFO("    DFP6: %s\n", encoder_names[radeon_encoder->encoder_id]);
 				if (devices & ATOM_DEVICE_TV1_SUPPORT)
 					DRM_INFO("    TV1: %s\n", encoder_names[radeon_encoder->encoder_id]);
 				if (devices & ATOM_DEVICE_CV_SUPPORT)
 {
 	struct radeon_framebuffer *radeon_fb = to_radeon_framebuffer(fb);
-	if (radeon_fb->obj)
+	if (radeon_fb->obj) {
 		drm_gem_object_unreference_unlocked(radeon_fb->obj);
+	}
 	drm_framebuffer_cleanup(fb);
 	kfree(radeon_fb);
 }

drivers/gpu/drm/radeon/radeon_fb.c+4−10

 	ret = radeon_bo_reserve(rbo, false);
 	if (likely(ret == 0)) {
 		radeon_bo_kunmap(rbo);
+		radeon_bo_unpin(rbo);
 		radeon_bo_unreserve(rbo);
 	}
+	drm_gem_object_handle_unreference(gobj);
 	drm_gem_object_unreference_unlocked(gobj);
 }
 {
 	struct fb_info *info;
 	struct radeon_framebuffer *rfb = &rfbdev->rfb;
-	struct radeon_bo *rbo;
-	int r;
 	if (rfbdev->helper.fbdev) {
 		info = rfbdev->helper.fbdev;
 	}
 	if (rfb->obj) {
-		rbo = rfb->obj->driver_private;
+		radeonfb_destroy_pinned_object(rfb->obj);
-		r = radeon_bo_reserve(rbo, false);
+		rfb->obj = NULL;
-		if (likely(r == 0)) {
-			radeon_bo_kunmap(rbo);
-			radeon_bo_unpin(rbo);
-			radeon_bo_unreserve(rbo);
-		}
-		drm_gem_object_unreference_unlocked(rfb->obj);
 	}
 	drm_fb_helper_fini(&rfbdev->helper);
 	drm_framebuffer_cleanup(&rfb->base);

drivers/gpu/drm/radeon/radeon_gem.c+2−2

 		return r;
 	}
 	r = drm_gem_handle_create(filp, gobj, &handle);
+	/* drop reference from allocate - handle holds it now */
+	drm_gem_object_unreference_unlocked(gobj);
 	if (r) {
-		drm_gem_object_unreference_unlocked(gobj);
 		return r;
 	}
-	drm_gem_object_handle_unreference_unlocked(gobj);
 	args->handle = handle;
 	return 0;
 }

drivers/gpu/drm/radeon/radeon_kms.c+4−0

  */
 int radeon_driver_firstopen_kms(struct drm_device *dev)
 {
+	struct radeon_device *rdev = dev->dev_private;
+	if (rdev->powered_down)
+		return -EINVAL;
 	return 0;
 }

drivers/gpu/drm/ttm/ttm_bo_util.c+1−0

@@ -351,6 +351,7 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo, · 350 unmodified lines
351	INIT_LIST_HEAD(&fbo->lru);	351	INIT_LIST_HEAD(&fbo->lru);
352	INIT_LIST_HEAD(&fbo->swap);	352	INIT_LIST_HEAD(&fbo->swap);
353	fbo->vm_node = NULL;	353	fbo->vm_node = NULL;
		354	atomic_set(&fbo->cpu_writers, 0);
354		355
355	fbo->sync_obj = driver->sync_obj_ref(bo->sync_obj);	356	fbo->sync_obj = driver->sync_obj_ref(bo->sync_obj);
356	kref_init(&fbo->list_kref);	357	kref_init(&fbo->list_kref);

drivers/gpu/drm/ttm/ttm_page_alloc.c+4−4

@@ -69,7 +69,7 @@ struct ttm_page_pool { · 68 unmodified lines
69	spinlock_t lock;	69	spinlock_t lock;
70	bool fill_lock;	70	bool fill_lock;
71	struct list_head list;	71	struct list_head list;
72	int gfp_flags;	72	gfp_t gfp_flags;
73	unsigned npages;	73	unsigned npages;
74	char *name;	74	char *name;
75	unsigned long nfrees;	75	unsigned long nfrees;
@@ -475,7 +475,7 @@ static void ttm_handle_caching_state_failure(struct list_head *pages, · 399 unmodified lines
475	* This function is reentrant if caller updates count depending on number of	475	* This function is reentrant if caller updates count depending on number of
476	* pages returned in pages array.	476	* pages returned in pages array.
477	*/	477	*/
478	static int ttm_alloc_new_pages(struct list_head *pages, int gfp_flags,	478	static int ttm_alloc_new_pages(struct list_head *pages, gfp_t gfp_flags,
479	int ttm_flags, enum ttm_caching_state cstate, unsigned count)	479	int ttm_flags, enum ttm_caching_state cstate, unsigned count)
480	{	480	{
481	struct page **caching_array;	481	struct page **caching_array;
@@ -666,7 +666,7 @@ int ttm_get_pages(struct list_head *pages, int flags, · 184 unmodified lines
666	{	666	{
667	struct ttm_page_pool *pool = ttm_get_pool(flags, cstate);	667	struct ttm_page_pool *pool = ttm_get_pool(flags, cstate);
668	struct page *p = NULL;	668	struct page *p = NULL;
669	int gfp_flags = GFP_USER;	669	gfp_t gfp_flags = GFP_USER;
670	int r;	670	int r;
671		671
672	/* set zero flag for page allocation if required */	672	/* set zero flag for page allocation if required */
@@ -818,7 +818,7 @@ int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages) · 145 unmodified lines
818	return 0;	818	return 0;
819	}	819	}
820		820
821	void ttm_page_alloc_fini()	821	void ttm_page_alloc_fini(void)
822	{	822	{
823	int i;	823	int i;
824		824

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c+110−35

 	{0, 0, 0}
 };
-static char *vmw_devname = "vmwgfx";
+static int enable_fbdev;
 static int vmw_probe(struct pci_dev *, const struct pci_device_id *);
 static void vmw_master_init(struct vmw_master *);
 static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val,
 			      void *ptr);
+MODULE_PARM_DESC(enable_fbdev, "Enable vmwgfx fbdev");
+module_param_named(enable_fbdev, enable_fbdev, int, 0600);
 static void vmw_print_capabilities(uint32_t capabilities)
 {
 	DRM_INFO("Capabilities:\n");
 {
 	int ret;
-	vmw_kms_save_vga(dev_priv);
 	ret = vmw_fifo_init(dev_priv, &dev_priv->fifo);
 	if (unlikely(ret != 0)) {
 		DRM_ERROR("Unable to initialize FIFO.\n");
 static void vmw_release_device(struct vmw_private *dev_priv)
 {
 	vmw_fifo_release(dev_priv, &dev_priv->fifo);
-	vmw_kms_restore_vga(dev_priv);
 }
+int vmw_3d_resource_inc(struct vmw_private *dev_priv)
+{
+	int ret = 0;
+	mutex_lock(&dev_priv->release_mutex);
+	if (unlikely(dev_priv->num_3d_resources++ == 0)) {
+		ret = vmw_request_device(dev_priv);
+		if (unlikely(ret != 0))
+			--dev_priv->num_3d_resources;
+	}
+	mutex_unlock(&dev_priv->release_mutex);
+	return ret;
+}
+void vmw_3d_resource_dec(struct vmw_private *dev_priv)
+{
+	int32_t n3d;
+	mutex_lock(&dev_priv->release_mutex);
+	if (unlikely(--dev_priv->num_3d_resources == 0))
+		vmw_release_device(dev_priv);
+	n3d = (int32_t) dev_priv->num_3d_resources;
+	mutex_unlock(&dev_priv->release_mutex);
+	BUG_ON(n3d < 0);
+}
 static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 {
 	dev_priv->last_read_sequence = (uint32_t) -100;
 	mutex_init(&dev_priv->hw_mutex);
 	mutex_init(&dev_priv->cmdbuf_mutex);
+	mutex_init(&dev_priv->release_mutex);
 	rwlock_init(&dev_priv->resource_lock);
 	idr_init(&dev_priv->context_idr);
 	idr_init(&dev_priv->surface_idr);
 	dev_priv->vram_start = pci_resource_start(dev->pdev, 1);
 	dev_priv->mmio_start = pci_resource_start(dev->pdev, 2);
+	dev_priv->enable_fb = enable_fbdev;
 	mutex_lock(&dev_priv->hw_mutex);
 	vmw_write(dev_priv, SVGA_REG_ID, SVGA_ID_2);
 	dev->dev_private = dev_priv;
-	if (!dev->devname)
-		dev->devname = vmw_devname;
-	if (dev_priv->capabilities & SVGA_CAP_IRQMASK) {
-		ret = drm_irq_install(dev);
-		if (unlikely(ret != 0)) {
-			DRM_ERROR("Failed installing irq: %d\n", ret);
-			goto out_no_irq;
-		}
-	}
 	ret = pci_request_regions(dev->pdev, "vmwgfx probe");
 	dev_priv->stealth = (ret != 0);
 	if (dev_priv->stealth) {
 			goto out_no_device;
 		}
 	}
-	ret = vmw_request_device(dev_priv);
+	ret = vmw_kms_init(dev_priv);
 	if (unlikely(ret != 0))
-		goto out_no_device;
+		goto out_no_kms;
-	vmw_kms_init(dev_priv);
 	vmw_overlay_init(dev_priv);
-	vmw_fb_init(dev_priv);
+	if (dev_priv->enable_fb) {
+		ret = vmw_3d_resource_inc(dev_priv);
+		if (unlikely(ret != 0))
+			goto out_no_fifo;
+		vmw_kms_save_vga(dev_priv);
+		vmw_fb_init(dev_priv);
+		DRM_INFO("%s", vmw_fifo_have_3d(dev_priv) ?
+			 "Detected device 3D availability.\n" :
+			 "Detected no device 3D availability.\n");
+	} else {
+		DRM_INFO("Delayed 3D detection since we're not "
+			 "running the device in SVGA mode yet.\n");
+	}
+	if (dev_priv->capabilities & SVGA_CAP_IRQMASK) {
+		ret = drm_irq_install(dev);
+		if (unlikely(ret != 0)) {
+			DRM_ERROR("Failed installing irq: %d\n", ret);
+			goto out_no_irq;
+		}
+	}
 	dev_priv->pm_nb.notifier_call = vmwgfx_pm_notifier;
 	register_pm_notifier(&dev_priv->pm_nb);
-	DRM_INFO("%s", vmw_fifo_have_3d(dev_priv) ? "Have 3D\n" : "No 3D\n");
 	return 0;
-out_no_device:
-	if (dev_priv->capabilities & SVGA_CAP_IRQMASK)
-		drm_irq_uninstall(dev_priv->dev);
-	if (dev->devname == vmw_devname)
-		dev->devname = NULL;
 out_no_irq:
+	if (dev_priv->enable_fb) {
+		vmw_fb_close(dev_priv);
+		vmw_kms_restore_vga(dev_priv);
+		vmw_3d_resource_dec(dev_priv);
+	}
+out_no_fifo:
+	vmw_overlay_close(dev_priv);
+	vmw_kms_close(dev_priv);
+out_no_kms:
+	if (dev_priv->stealth)
+		pci_release_region(dev->pdev, 2);
+	else
+		pci_release_regions(dev->pdev);
+out_no_device:
 	ttm_object_device_release(&dev_priv->tdev);
 out_err4:
 	iounmap(dev_priv->mmio_virt);
 	unregister_pm_notifier(&dev_priv->pm_nb);
-	vmw_fb_close(dev_priv);
+	if (dev_priv->capabilities & SVGA_CAP_IRQMASK)
+		drm_irq_uninstall(dev_priv->dev);
+	if (dev_priv->enable_fb) {
+		vmw_fb_close(dev_priv);
+		vmw_kms_restore_vga(dev_priv);
+		vmw_3d_resource_dec(dev_priv);
+	}
 	vmw_kms_close(dev_priv);
 	vmw_overlay_close(dev_priv);
-	vmw_release_device(dev_priv);
 	if (dev_priv->stealth)
 		pci_release_region(dev->pdev, 2);
 	else
 		pci_release_regions(dev->pdev);
-	if (dev_priv->capabilities & SVGA_CAP_IRQMASK)
-		drm_irq_uninstall(dev_priv->dev);
-	if (dev->devname == vmw_devname)
-		dev->devname = NULL;
 	ttm_object_device_release(&dev_priv->tdev);
 	iounmap(dev_priv->mmio_virt);
 	drm_mtrr_del(dev_priv->mmio_mtrr, dev_priv->mmio_start,
 		struct drm_ioctl_desc *ioctl =
 		    &vmw_ioctls[nr - DRM_COMMAND_BASE];
-		if (unlikely(ioctl->cmd != cmd)) {
+		if (unlikely(ioctl->cmd_drv != cmd)) {
 			DRM_ERROR("Invalid command format, ioctl %d\n",
 				  nr - DRM_COMMAND_BASE);
 			return -EINVAL;
 	struct vmw_master *vmaster = vmw_master(file_priv->master);
 	int ret = 0;
+	if (!dev_priv->enable_fb) {
+		ret = vmw_3d_resource_inc(dev_priv);
+		if (unlikely(ret != 0))
+			return ret;
+		vmw_kms_save_vga(dev_priv);
+		mutex_lock(&dev_priv->hw_mutex);
+		vmw_write(dev_priv, SVGA_REG_TRACES, 0);
+		mutex_unlock(&dev_priv->hw_mutex);
+	}
 	if (active) {
 		BUG_ON(active != &dev_priv->fbdev_master);
 		ret = ttm_vt_lock(&active->lock, false, vmw_fp->tfile);
 	return 0;
 out_no_active_lock:
-	vmw_release_device(dev_priv);
+	if (!dev_priv->enable_fb) {
+		mutex_lock(&dev_priv->hw_mutex);
+		vmw_write(dev_priv, SVGA_REG_TRACES, 1);
+		mutex_unlock(&dev_priv->hw_mutex);
+		vmw_kms_restore_vga(dev_priv);
+		vmw_3d_resource_dec(dev_priv);
+	}
 	return ret;
 }
 	ttm_lock_set_kill(&vmaster->lock, true, SIGTERM);
+	if (!dev_priv->enable_fb) {
+		ret = ttm_bo_evict_mm(&dev_priv->bdev, TTM_PL_VRAM);
+		if (unlikely(ret != 0))
+			DRM_ERROR("Unable to clean VRAM on master drop.\n");
+		mutex_lock(&dev_priv->hw_mutex);
+		vmw_write(dev_priv, SVGA_REG_TRACES, 1);
+		mutex_unlock(&dev_priv->hw_mutex);
+		vmw_kms_restore_vga(dev_priv);
+		vmw_3d_resource_dec(dev_priv);
+	}
 	dev_priv->active_master = &dev_priv->fbdev_master;
 	ttm_lock_set_kill(&dev_priv->fbdev_master.lock, false, SIGTERM);
 	ttm_vt_unlock(&dev_priv->fbdev_master.lock);
-	vmw_fb_on(dev_priv);
+	if (dev_priv->enable_fb)
+		vmw_fb_on(dev_priv);
 }
 	.irq_postinstall = vmw_irq_postinstall,
 	.irq_uninstall = vmw_irq_uninstall,
 	.irq_handler = vmw_irq_handler,
+	.get_vblank_counter = vmw_get_vblank_counter,
 	.reclaim_buffers_locked = NULL,
 	.get_map_ofs = drm_core_get_map_ofs,
 	.get_reg_ofs = drm_core_get_reg_ofs,

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h+8−0

 	bool stealth;
 	bool is_opened;
+	bool enable_fb;
 	/**
 	 * Master management.
 	struct vmw_master *active_master;
 	struct vmw_master fbdev_master;
 	struct notifier_block pm_nb;
+	struct mutex release_mutex;
+	uint32_t num_3d_resources;
 };
 static inline struct vmw_private *vmw_priv(struct drm_device *dev)
 	return val;
 }
+int vmw_3d_resource_inc(struct vmw_private *dev_priv);
+void vmw_3d_resource_dec(struct vmw_private *dev_priv);
 /**
  * GMR utilities - vmwgfx_gmr.c
  */
 			unsigned bbp, unsigned depth);
 int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data,
 				struct drm_file *file_priv);
+u32 vmw_get_vblank_counter(struct drm_device *dev, int crtc);
 /**
  * Overlay control - vmwgfx_overlay.c

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c+5−0

 	if (unlikely(ret != 0))
 		goto err_unlock;
+	if (bo->mem.mem_type == TTM_PL_VRAM &&
+	    bo->mem.mm_node->start < bo->num_pages)
+		(void) ttm_bo_validate(bo, &vmw_sys_placement, false,
+				       false, false);
 	ret = ttm_bo_validate(bo, &ne_placement, false, false, false);
 	/* Could probably bug on */

drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c+3−0

 	mutex_lock(&dev_priv->hw_mutex);
 	dev_priv->enable_state = vmw_read(dev_priv, SVGA_REG_ENABLE);
 	dev_priv->config_done_state = vmw_read(dev_priv, SVGA_REG_CONFIG_DONE);
+	dev_priv->traces_state = vmw_read(dev_priv, SVGA_REG_TRACES);
 	vmw_write(dev_priv, SVGA_REG_ENABLE, 1);
 	min = 4;
 		  dev_priv->config_done_state);
 	vmw_write(dev_priv, SVGA_REG_ENABLE,
 		  dev_priv->enable_state);
+	vmw_write(dev_priv, SVGA_REG_TRACES,
+		  dev_priv->traces_state);
 	mutex_unlock(&dev_priv->hw_mutex);
 	vmw_fence_queue_takedown(&fifo->fence_queue);

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c+17−0

@@ -898,7 +898,19 @@ int vmw_kms_save_vga(struct vmw_private *vmw_priv) · 897 unmodified lines
898	save->width = vmw_read(vmw_priv, SVGA_REG_DISPLAY_WIDTH);	898	save->width = vmw_read(vmw_priv, SVGA_REG_DISPLAY_WIDTH);
899	save->height = vmw_read(vmw_priv, SVGA_REG_DISPLAY_HEIGHT);	899	save->height = vmw_read(vmw_priv, SVGA_REG_DISPLAY_HEIGHT);
900	vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID);	900	vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID);
		901	if (i == 0 && vmw_priv->num_displays == 1 &&
		902	save->width == 0 && save->height == 0) {
		903
		904	/*
		905	* It should be fairly safe to assume that these
		906	* values are uninitialized.
		907	*/
		908
		909	save->width = vmw_priv->vga_width - save->pos_x;
		910	save->height = vmw_priv->vga_height - save->pos_y;
		911	}
901	}	912	}
		913
902	return 0;	914	return 0;
903	}	915	}
904		916
@@ -984,3 +996,8 @@ out_unlock: · 79 unmodified lines
984	ttm_read_unlock(&vmaster->lock);	996	ttm_read_unlock(&vmaster->lock);
985	return ret;	997	return ret;
986	}	998	}
		999
		1000	u32 vmw_get_vblank_counter(struct drm_device *dev, int crtc)
		1001	{
		1002	return 0;
		1003	}

drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c+17−10

 #include "vmwgfx_kms.h"
+#define VMWGFX_LDU_NUM_DU 8
 #define vmw_crtc_to_ldu(x) \
 	container_of(x, struct vmw_legacy_display_unit, base.crtc)
 #define vmw_encoder_to_ldu(x) \
 int vmw_kms_init_legacy_display_system(struct vmw_private *dev_priv)
 {
+	struct drm_device *dev = dev_priv->dev;
+	int i;
+	int ret;
 	if (dev_priv->ldu_priv) {
 		DRM_INFO("ldu system already on\n");
 		return -EINVAL;
 	drm_mode_create_dirty_info_property(dev_priv->dev);
-	vmw_ldu_init(dev_priv, 0);
-	/* for old hardware without multimon only enable one display */
 	if (dev_priv->capabilities & SVGA_CAP_MULTIMON) {
-		vmw_ldu_init(dev_priv, 1);
+		for (i = 0; i < VMWGFX_LDU_NUM_DU; ++i)
-		vmw_ldu_init(dev_priv, 2);
+			vmw_ldu_init(dev_priv, i);
-		vmw_ldu_init(dev_priv, 3);
+		ret = drm_vblank_init(dev, VMWGFX_LDU_NUM_DU);
-		vmw_ldu_init(dev_priv, 4);
+	} else {
-		vmw_ldu_init(dev_priv, 5);
+		/* for old hardware without multimon only enable one display */
-		vmw_ldu_init(dev_priv, 6);
+		vmw_ldu_init(dev_priv, 0);
-		vmw_ldu_init(dev_priv, 7);
+		ret = drm_vblank_init(dev, 1);
 	}
-	return 0;
+	return ret;
 }
 int vmw_kms_close_legacy_display_system(struct vmw_private *dev_priv)
 {
+	struct drm_device *dev = dev_priv->dev;
+	drm_vblank_cleanup(dev);
 	if (!dev_priv->ldu_priv)
 		return -ENOSYS;

drivers/gpu/drm/vmwgfx/vmwgfx_resource.c+4−0

 	cmd->body.cid = cpu_to_le32(res->id);
 	vmw_fifo_commit(dev_priv, sizeof(*cmd));
+	vmw_3d_resource_dec(dev_priv);
 }
 static int vmw_context_init(struct vmw_private *dev_priv,
 	cmd->body.cid = cpu_to_le32(res->id);
 	vmw_fifo_commit(dev_priv, sizeof(*cmd));
+	(void) vmw_3d_resource_inc(dev_priv);
 	vmw_resource_activate(res, vmw_hw_context_destroy);
 	return 0;
 }
 	cmd->body.sid = cpu_to_le32(res->id);
 	vmw_fifo_commit(dev_priv, sizeof(*cmd));
+	vmw_3d_resource_dec(dev_priv);
 }
 void vmw_surface_res_free(struct vmw_resource *res)
 	}
 	vmw_fifo_commit(dev_priv, submit_size);
+	(void) vmw_3d_resource_inc(dev_priv);
 	vmw_resource_activate(res, vmw_hw_surface_destroy);
 	return 0;
 }

drivers/gpu/vga/vgaarb.c+1−1

@@ -598,7 +598,7 @@ static inline void vga_update_device_decodes(struct vga_device *vgadev, · 597 unmodified lines
598	pr_debug("vgaarb: decoding count now is: %d\n", vga_decode_count);	598	pr_debug("vgaarb: decoding count now is: %d\n", vga_decode_count);
599	}	599	}
600		600
601	void __vga_set_legacy_decoding(struct pci_dev *pdev, unsigned int decodes, bool userspace)	601	static void __vga_set_legacy_decoding(struct pci_dev *pdev, unsigned int decodes, bool userspace)
602	{	602	{
603	struct vga_device *vgadev;	603	struct vga_device *vgadev;
604	unsigned long flags;	604	unsigned long flags;

drivers/hwmon/Kconfig+1−1

@@ -409,7 +409,7 @@ config SENSORS_CORETEMP · 408 unmodified lines
409		409
410	config SENSORS_PKGTEMP	410	config SENSORS_PKGTEMP
411	tristate "Intel processor package temperature sensor"	411	tristate "Intel processor package temperature sensor"
412	depends on X86 && PCI && EXPERIMENTAL	412	depends on X86 && EXPERIMENTAL
413	help	413	help
414	If you say yes here you get support for the package level temperature	414	If you say yes here you get support for the package level temperature
415	sensor inside your CPU. Check documentation/driver for details.	415	sensor inside your CPU. Check documentation/driver for details.

drivers/hwmon/coretemp.c+33−24

@@ -36,6 +36,7 @@ · 35 unmodified lines
36	#include <linux/pci.h>	36	#include <linux/pci.h>
37	#include <asm/msr.h>	37	#include <asm/msr.h>
38	#include <asm/processor.h>	38	#include <asm/processor.h>
		39	#include <asm/smp.h>
39		40
40	#define DRVNAME "coretemp"	41	#define DRVNAME "coretemp"
41		42
@@ -423,9 +424,18 @@ static int __cpuinit coretemp_device_add(unsigned int cpu) · 381 unmodified lines
423	int err;	424	int err;
424	struct platform_device *pdev;	425	struct platform_device *pdev;
425	struct pdev_entry *pdev_entry;	426	struct pdev_entry *pdev_entry;
426	#ifdef CONFIG_SMP
427	struct cpuinfo_x86 *c = &cpu_data(cpu);	427	struct cpuinfo_x86 *c = &cpu_data(cpu);
428	#endif	428
		429	/*
		430	* CPUID.06H.EAX[0] indicates whether the CPU has thermal
		431	* sensors. We check this bit only, all the early CPUs
		432	* without thermal sensors will be filtered out.
		433	*/
		434	if (!cpu_has(c, X86_FEATURE_DTS)) {
		435	printk(KERN_INFO DRVNAME ": CPU (model=0x%x)"
		436	" has no thermal sensor.\n", c->x86_model);
		437	return 0;
		438	}
429		439
430	mutex_lock(&pdev_list_mutex);	440	mutex_lock(&pdev_list_mutex);
431		441
@@ -482,14 +492,22 @@ exit: · 50 unmodified lines
482		492
483	static void coretemp_device_remove(unsigned int cpu)	493	static void coretemp_device_remove(unsigned int cpu)
484	{	494	{
485	struct pdev_entry p, n;	495	struct pdev_entry *p;
		496	unsigned int i;
		497
486	mutex_lock(&pdev_list_mutex);	498	mutex_lock(&pdev_list_mutex);
487	list_for_each_entry_safe(p, n, &pdev_list, list) {	499	list_for_each_entry(p, &pdev_list, list) {
488	if (p->cpu == cpu) {	500	if (p->cpu != cpu)
489	platform_device_unregister(p->pdev);	501	continue;
490	list_del(&p->list);	502
491	kfree(p);	503	platform_device_unregister(p->pdev);
492	}	504	list_del(&p->list);
		505	mutex_unlock(&pdev_list_mutex);
		506	kfree(p);
		507	for_each_cpu(i, cpu_sibling_mask(cpu))
		508	if (i != cpu && !coretemp_device_add(i))
		509	break;
		510	return;
493	}	511	}
494	mutex_unlock(&pdev_list_mutex);	512	mutex_unlock(&pdev_list_mutex);
495	}	513	}
@@ -527,30 +545,21 @@ static int __init coretemp_init(void) · 31 unmodified lines
527	if (err)	545	if (err)
528	goto exit;	546	goto exit;
529		547
530	for_each_online_cpu(i) {	548	for_each_online_cpu(i)
531	struct cpuinfo_x86 *c = &cpu_data(i);	549	coretemp_device_add(i);
532	/*	550
533	* CPUID.06H.EAX[0] indicates whether the CPU has thermal	551	#ifndef CONFIG_HOTPLUG_CPU
534	* sensors. We check this bit only, all the early CPUs
535	* without thermal sensors will be filtered out.
536	*/
537	if (c->cpuid_level >= 6 && (cpuid_eax(0x06) & 0x01))
538	coretemp_device_add(i);
539	else {
540	printk(KERN_INFO DRVNAME ": CPU (model=0x%x)"
541	" has no thermal sensor.\n", c->x86_model);
542	}
543	}
544	if (list_empty(&pdev_list)) {	552	if (list_empty(&pdev_list)) {
545	err = -ENODEV;	553	err = -ENODEV;
546	goto exit_driver_unreg;	554	goto exit_driver_unreg;
547	}	555	}
		556	#endif
548		557
549	register_hotcpu_notifier(&coretemp_cpu_notifier);	558	register_hotcpu_notifier(&coretemp_cpu_notifier);
550	return 0;	559	return 0;
551		560
552	exit_driver_unreg:
553	#ifndef CONFIG_HOTPLUG_CPU	561	#ifndef CONFIG_HOTPLUG_CPU
		562	exit_driver_unreg:
554	platform_driver_unregister(&coretemp_driver);	563	platform_driver_unregister(&coretemp_driver);
555	#endif	564	#endif
556	exit:	565	exit:

drivers/hwmon/f71882fg.c+19−13

@@ -111,7 +111,7 @@ static struct platform_device *f71882fg_pdev; · 110 unmodified lines
111	/* Super-I/O Function prototypes */	111	/* Super-I/O Function prototypes */
112	static inline int superio_inb(int base, int reg);	112	static inline int superio_inb(int base, int reg);
113	static inline int superio_inw(int base, int reg);	113	static inline int superio_inw(int base, int reg);
114	static inline void superio_enter(int base);	114	static inline int superio_enter(int base);
115	static inline void superio_select(int base, int ld);	115	static inline void superio_select(int base, int ld);
116	static inline void superio_exit(int base);	116	static inline void superio_exit(int base);
117		117
@@ -861,11 +861,20 @@ static int superio_inw(int base, int reg) · 743 unmodified lines
861	return val;	861	return val;
862	}	862	}
863		863
864	static inline void superio_enter(int base)	864	static inline int superio_enter(int base)
865	{	865	{
		866	/* Don't step on other drivers' I/O space by accident */
		867	if (!request_muxed_region(base, 2, DRVNAME)) {
		868	printk(KERN_ERR DRVNAME ": I/O address 0x%04x already in use\n",
		869	base);
		870	return -EBUSY;
		871	}
		872
866	/* according to the datasheet the key must be send twice! */	873	/* according to the datasheet the key must be send twice! */
867	outb(SIO_UNLOCK_KEY, base);	874	outb(SIO_UNLOCK_KEY, base);
868	outb(SIO_UNLOCK_KEY, base);	875	outb(SIO_UNLOCK_KEY, base);
		876
		877	return 0;
869	}	878	}
870		879
871	static inline void superio_select(int base, int ld)	880	static inline void superio_select(int base, int ld)
@@ -877,6 +886,7 @@ static inline void superio_select(int base, int ld) · 5 unmodified lines
877	static inline void superio_exit(int base)	886	static inline void superio_exit(int base)
878	{	887	{
879	outb(SIO_LOCK_KEY, base);	888	outb(SIO_LOCK_KEY, base);
		889	release_region(base, 2);
880	}	890	}
881		891
882	static inline int fan_from_reg(u16 reg)	892	static inline int fan_from_reg(u16 reg)
@@ -2175,21 +2185,15 @@ static int f71882fg_remove(struct platform_device *pdev) · 1292 unmodified lines
2175	static int __init f71882fg_find(int sioaddr, unsigned short *address,	2185	static int __init f71882fg_find(int sioaddr, unsigned short *address,
2176	struct f71882fg_sio_data *sio_data)	2186	struct f71882fg_sio_data *sio_data)
2177	{	2187	{
2178	int err = -ENODEV;
2179	u16 devid;	2188	u16 devid;
2180		2189	int err = superio_enter(sioaddr);
2181	/* Don't step on other drivers' I/O space by accident */	2190	if (err)
2182	if (!request_region(sioaddr, 2, DRVNAME)) {	2191	return err;
2183	printk(KERN_ERR DRVNAME ": I/O address 0x%04x already in use\n",
2184	(int)sioaddr);
2185	return -EBUSY;
2186	}
2187
2188	superio_enter(sioaddr);
2189		2192
2190	devid = superio_inw(sioaddr, SIO_REG_MANID);	2193	devid = superio_inw(sioaddr, SIO_REG_MANID);
2191	if (devid != SIO_FINTEK_ID) {	2194	if (devid != SIO_FINTEK_ID) {
2192	pr_debug(DRVNAME ": Not a Fintek device\n");	2195	pr_debug(DRVNAME ": Not a Fintek device\n");
		2196	err = -ENODEV;
2193	goto exit;	2197	goto exit;
2194	}	2198	}
2195		2199
@@ -2213,6 +2217,7 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address, · 17 unmodified lines
2213	default:	2217	default:
2214	printk(KERN_INFO DRVNAME ": Unsupported Fintek device: %04x\n",	2218	printk(KERN_INFO DRVNAME ": Unsupported Fintek device: %04x\n",
2215	(unsigned int)devid);	2219	(unsigned int)devid);
		2220	err = -ENODEV;
2216	goto exit;	2221	goto exit;
2217	}	2222	}
2218		2223
@@ -2223,12 +2228,14 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address, · 4 unmodified lines
2223		2228
2224	if (!(superio_inb(sioaddr, SIO_REG_ENABLE) & 0x01)) {	2229	if (!(superio_inb(sioaddr, SIO_REG_ENABLE) & 0x01)) {
2225	printk(KERN_WARNING DRVNAME ": Device not activated\n");	2230	printk(KERN_WARNING DRVNAME ": Device not activated\n");
		2231	err = -ENODEV;
2226	goto exit;	2232	goto exit;
2227	}	2233	}
2228		2234
2229	*address = superio_inw(sioaddr, SIO_REG_ADDR);	2235	*address = superio_inw(sioaddr, SIO_REG_ADDR);
2230	if (*address == 0) {	2236	if (*address == 0) {
2231	printk(KERN_WARNING DRVNAME ": Base address not set\n");	2237	printk(KERN_WARNING DRVNAME ": Base address not set\n");
		2238	err = -ENODEV;
2232	goto exit;	2239	goto exit;
2233	}	2240	}
2234	address &= ~(REGION_LENGTH - 1); / Ignore 3 LSB */	2241	address &= ~(REGION_LENGTH - 1); / Ignore 3 LSB */
@@ -2239,7 +2246,6 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address, · 4 unmodified lines
2239	(int)superio_inb(sioaddr, SIO_REG_DEVREV));	2246	(int)superio_inb(sioaddr, SIO_REG_DEVREV));
2240	exit:	2247	exit:
2241	superio_exit(sioaddr);	2248	superio_exit(sioaddr);
2242	release_region(sioaddr, 2);
2243	return err;	2249	return err;
2244	}	2250	}
2245		2251

drivers/hwmon/lis3lv02d.c+2−2

@@ -277,7 +277,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *dummy) · 276 unmodified lines
277	wake_up_interruptible(&lis3_dev.misc_wait);	277	wake_up_interruptible(&lis3_dev.misc_wait);
278	kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN);	278	kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN);
279	out:	279	out:
280	if (lis3_dev.whoami == WAI_8B && lis3_dev.idev &&	280	if (lis3_dev.pdata && lis3_dev.whoami == WAI_8B && lis3_dev.idev &&
281	lis3_dev.idev->input->users)	281	lis3_dev.idev->input->users)
282	return IRQ_WAKE_THREAD;	282	return IRQ_WAKE_THREAD;
283	return IRQ_HANDLED;	283	return IRQ_HANDLED;
@@ -718,7 +718,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev) · 434 unmodified lines
718	* io-apic is not configurable (and generates a warning) but I keep it	718	* io-apic is not configurable (and generates a warning) but I keep it
719	* in case of support for other hardware.	719	* in case of support for other hardware.
720	*/	720	*/
721	if (dev->whoami == WAI_8B)	721	if (dev->pdata && dev->whoami == WAI_8B)
722	thread_fn = lis302dl_interrupt_thread1_8b;	722	thread_fn = lis302dl_interrupt_thread1_8b;
723	else	723	else
724	thread_fn = NULL;	724	thread_fn = NULL;

drivers/hwmon/pkgtemp.c+11−12

@@ -33,7 +33,6 @@ · 32 unmodified lines
33	#include <linux/list.h>	33	#include <linux/list.h>
34	#include <linux/platform_device.h>	34	#include <linux/platform_device.h>
35	#include <linux/cpu.h>	35	#include <linux/cpu.h>
36	#include <linux/pci.h>
37	#include <asm/msr.h>	36	#include <asm/msr.h>
38	#include <asm/processor.h>	37	#include <asm/processor.h>
39		38
@@ -224,7 +223,7 @@ static int __devinit pkgtemp_probe(struct platform_device *pdev) · 184 unmodified lines
224		223
225	err = sysfs_create_group(&pdev->dev.kobj, &pkgtemp_group);	224	err = sysfs_create_group(&pdev->dev.kobj, &pkgtemp_group);
226	if (err)	225	if (err)
227	goto exit_free;	226	goto exit_dev;
228		227
229	data->hwmon_dev = hwmon_device_register(&pdev->dev);	228	data->hwmon_dev = hwmon_device_register(&pdev->dev);
230	if (IS_ERR(data->hwmon_dev)) {	229	if (IS_ERR(data->hwmon_dev)) {
@@ -238,6 +237,8 @@ static int __devinit pkgtemp_probe(struct platform_device *pdev) · 7 unmodified lines
238		237
239	exit_class:	238	exit_class:
240	sysfs_remove_group(&pdev->dev.kobj, &pkgtemp_group);	239	sysfs_remove_group(&pdev->dev.kobj, &pkgtemp_group);
		240	exit_dev:
		241	device_remove_file(&pdev->dev, &sensor_dev_attr_temp1_max.dev_attr);
241	exit_free:	242	exit_free:
242	kfree(data);	243	kfree(data);
243	exit:	244	exit:
@@ -250,6 +251,7 @@ static int __devexit pkgtemp_remove(struct platform_device *pdev) · 6 unmodified lines
250		251
251	hwmon_device_unregister(data->hwmon_dev);	252	hwmon_device_unregister(data->hwmon_dev);
252	sysfs_remove_group(&pdev->dev.kobj, &pkgtemp_group);	253	sysfs_remove_group(&pdev->dev.kobj, &pkgtemp_group);
		254	device_remove_file(&pdev->dev, &sensor_dev_attr_temp1_max.dev_attr);
253	platform_set_drvdata(pdev, NULL);	255	platform_set_drvdata(pdev, NULL);
254	kfree(data);	256	kfree(data);
255	return 0;	257	return 0;
@@ -281,9 +283,10 @@ static int __cpuinit pkgtemp_device_add(unsigned int cpu) · 25 unmodified lines
281	int err;	283	int err;
282	struct platform_device *pdev;	284	struct platform_device *pdev;
283	struct pdev_entry *pdev_entry;	285	struct pdev_entry *pdev_entry;
284	#ifdef CONFIG_SMP
285	struct cpuinfo_x86 *c = &cpu_data(cpu);	286	struct cpuinfo_x86 *c = &cpu_data(cpu);
286	#endif	287
		288	if (!cpu_has(c, X86_FEATURE_PTS))
		289	return 0;
287		290
288	mutex_lock(&pdev_list_mutex);	291	mutex_lock(&pdev_list_mutex);
289		292
@@ -339,17 +342,18 @@ exit: · 49 unmodified lines
339	#ifdef CONFIG_HOTPLUG_CPU	342	#ifdef CONFIG_HOTPLUG_CPU
340	static void pkgtemp_device_remove(unsigned int cpu)	343	static void pkgtemp_device_remove(unsigned int cpu)
341	{	344	{
342	struct pdev_entry p, n;	345	struct pdev_entry *p;
343	unsigned int i;	346	unsigned int i;
344	int err;	347	int err;
345		348
346	mutex_lock(&pdev_list_mutex);	349	mutex_lock(&pdev_list_mutex);
347	list_for_each_entry_safe(p, n, &pdev_list, list) {	350	list_for_each_entry(p, &pdev_list, list) {
348	if (p->cpu != cpu)	351	if (p->cpu != cpu)
349	continue;	352	continue;
350		353
351	platform_device_unregister(p->pdev);	354	platform_device_unregister(p->pdev);
352	list_del(&p->list);	355	list_del(&p->list);
		356	mutex_unlock(&pdev_list_mutex);
353	kfree(p);	357	kfree(p);
354	for_each_cpu(i, cpu_core_mask(cpu)) {	358	for_each_cpu(i, cpu_core_mask(cpu)) {
355	if (i != cpu) {	359	if (i != cpu) {
@@ -358,7 +362,7 @@ static void pkgtemp_device_remove(unsigned int cpu) · 2 unmodified lines
358	break;	362	break;
359	}	363	}
360	}	364	}
361	break;	365	return;
362	}	366	}
363	mutex_unlock(&pdev_list_mutex);	367	mutex_unlock(&pdev_list_mutex);
364	}	368	}
@@ -399,11 +403,6 @@ static int __init pkgtemp_init(void) · 34 unmodified lines
399	goto exit;	403	goto exit;
400		404
401	for_each_online_cpu(i) {	405	for_each_online_cpu(i) {
402	struct cpuinfo_x86 *c = &cpu_data(i);
403
404	if (!cpu_has(c, X86_FEATURE_PTS))
405	continue;
406
407	err = pkgtemp_device_add(i);	406	err = pkgtemp_device_add(i);
408	if (err)	407	if (err)
409	goto exit_devices_unreg;	408	goto exit_devices_unreg;

drivers/i2c/busses/i2c-davinci.c+3−3

 	dev->terminate = 0;
-	/* write the data into mode register */
-	davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, flag);
 	/*
 	 * First byte should be set here, not after interrupt,
 	 * because transmit-data-ready interrupt can come before
 		dev->buf_len--;
 	}
+	/* write the data into mode register; start transmitting */
+	davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, flag);
 	r = wait_for_completion_interruptible_timeout(&dev->cmd_complete,
 						      dev->adapter.timeout);
 	if (r == 0) {

drivers/i2c/busses/i2c-octeon.c+1−1

@@ -218,7 +218,7 @@ static int octeon_i2c_wait(struct octeon_i2c *i2c) · 217 unmodified lines
218	return result;	218	return result;
219	} else if (result == 0) {	219	} else if (result == 0) {
220	dev_dbg(i2c->dev, "%s: timeout\n", __func__);	220	dev_dbg(i2c->dev, "%s: timeout\n", __func__);
221	result = -ETIMEDOUT;	221	return -ETIMEDOUT;
222	}	222	}
223		223
224	return 0;	224	return 0;

drivers/i2c/busses/i2c-s3c2410.c+2−2

@@ -662,8 +662,8 @@ static int s3c24xx_i2c_clockrate(struct s3c24xx_i2c i2c, unsigned int got) · 661 unmodified lines
662	unsigned long sda_delay;	662	unsigned long sda_delay;
663		663
664	if (pdata->sda_delay) {	664	if (pdata->sda_delay) {
665	sda_delay = (freq / 1000) * pdata->sda_delay;	665	sda_delay = clkin * pdata->sda_delay;
666	sda_delay /= 1000000;	666	sda_delay = DIV_ROUND_UP(sda_delay, 1000000);
667	sda_delay = DIV_ROUND_UP(sda_delay, 5);	667	sda_delay = DIV_ROUND_UP(sda_delay, 5);
668	if (sda_delay > 3)	668	if (sda_delay > 3)
669	sda_delay = 3;	669	sda_delay = 3;

drivers/idle/intel_idle.c+15−5

 /* Reliable LAPIC Timer States, bit 1 for C1 etc.  */
 static unsigned int lapic_timer_reliable_states;
-static struct cpuidle_device *intel_idle_cpuidle_devices;
+static struct cpuidle_device __percpu *intel_idle_cpuidle_devices;
 static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state);
 static struct cpuidle_state *cpuidle_state_table;
 		.name = "NHM-C3",
 		.desc = "MWAIT 0x10",
 		.driver_data = (void *) 0x10,
-		.flags = CPUIDLE_FLAG_TIME_VALID,
+		.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
 		.exit_latency = 20,
 		.power_usage = 500,
 		.target_residency = 80,
 		.name = "NHM-C6",
 		.desc = "MWAIT 0x20",
 		.driver_data = (void *) 0x20,
-		.flags = CPUIDLE_FLAG_TIME_VALID,
+		.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
 		.exit_latency = 200,
 		.power_usage = 350,
 		.target_residency = 800,
 		.name = "ATM-C4",
 		.desc = "MWAIT 0x30",
 		.driver_data = (void *) 0x30,
-		.flags = CPUIDLE_FLAG_TIME_VALID,
+		.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
 		.exit_latency = 100,
 		.power_usage = 250,
 		.target_residency = 400,
 		.name = "ATM-C6",
 		.desc = "MWAIT 0x40",
 		.driver_data = (void *) 0x40,
-		.flags = CPUIDLE_FLAG_TIME_VALID,
+		.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
 		.exit_latency = 200,
 		.power_usage = 150,
 		.target_residency = 800,
 	local_irq_disable();
+	/*
+	 * If the state flag indicates that the TLB will be flushed or if this
+	 * is the deepest c-state supported, do a voluntary leave mm to avoid
+	 * costly and mostly unnecessary wakeups for flushing the user TLB's
+	 * associated with the active mm.
+	 */
+	if (state->flags & CPUIDLE_FLAG_TLB_FLUSHED ||
+	    (&dev->states[dev->state_count - 1] == state))
+		leave_mm(cpu);
 	if (!(lapic_timer_reliable_states & (1 << (cstate))))
 		clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu);

drivers/infiniband/hw/cxgb3/iwch_cm.c+4−2

 	    V_MSS_IDX(mtu_idx) |
 	    V_L2T_IDX(ep->l2t->idx) | V_TX_CHANNEL(ep->l2t->smt_idx);
 	opt0l = V_TOS((ep->tos >> 2) & M_TOS) | V_RCV_BUFSIZ(rcv_win>>10);
-	opt2 = V_FLAVORS_VALID(1) | V_CONG_CONTROL_FLAVOR(cong_flavor);
+	opt2 = F_RX_COALESCE_VALID | V_RX_COALESCE(0) | V_FLAVORS_VALID(1) |
+	       V_CONG_CONTROL_FLAVOR(cong_flavor);
 	skb->priority = CPL_PRIORITY_SETUP;
 	set_arp_failure_handler(skb, act_open_req_arp_failure);
 	    V_MSS_IDX(mtu_idx) |
 	    V_L2T_IDX(ep->l2t->idx) | V_TX_CHANNEL(ep->l2t->smt_idx);
 	opt0l = V_TOS((ep->tos >> 2) & M_TOS) | V_RCV_BUFSIZ(rcv_win>>10);
-	opt2 = V_FLAVORS_VALID(1) | V_CONG_CONTROL_FLAVOR(cong_flavor);
+	opt2 = F_RX_COALESCE_VALID | V_RX_COALESCE(0) | V_FLAVORS_VALID(1) |
+	       V_CONG_CONTROL_FLAVOR(cong_flavor);
 	rpl = cplhdr(skb);
 	rpl->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));

drivers/leds/leds-ns2.c+5−4

 	int cmd_level;
 	int slow_level;
-	read_lock(&led_dat->rw_lock);
+	read_lock_irq(&led_dat->rw_lock);
 	cmd_level = gpio_get_value(led_dat->cmd);
 	slow_level = gpio_get_value(led_dat->slow);
 		}
 	}
-	read_unlock(&led_dat->rw_lock);
+	read_unlock_irq(&led_dat->rw_lock);
 	return ret;
 }
 			     enum ns2_led_modes mode)
 {
 	int i;
+	unsigned long flags;
-	write_lock(&led_dat->rw_lock);
+	write_lock_irqsave(&led_dat->rw_lock, flags);
 	for (i = 0; i < ARRAY_SIZE(ns2_led_modval); i++) {
 		if (mode == ns2_led_modval[i].mode) {
 		}
 	}
-	write_unlock(&led_dat->rw_lock);
+	write_unlock_irqrestore(&led_dat->rw_lock, flags);
 }
 static void ns2_led_set(struct led_classdev *led_cdev,

drivers/mfd/max8925-core.c+7−6

 	irq_tsc = cache_tsc;
 	for (i = 0; i < ARRAY_SIZE(max8925_irqs); i++) {
 		irq_data = &max8925_irqs[i];
+		/* 1 -- disable, 0 -- enable */
 		switch (irq_data->mask_reg) {
 		case MAX8925_CHG_IRQ1_MASK:
-			irq_chg[0] &= irq_data->enable;
+			irq_chg[0] &= ~irq_data->enable;
 			break;
 		case MAX8925_CHG_IRQ2_MASK:
-			irq_chg[1] &= irq_data->enable;
+			irq_chg[1] &= ~irq_data->enable;
 			break;
 		case MAX8925_ON_OFF_IRQ1_MASK:
-			irq_on[0] &= irq_data->enable;
+			irq_on[0] &= ~irq_data->enable;
 			break;
 		case MAX8925_ON_OFF_IRQ2_MASK:
-			irq_on[1] &= irq_data->enable;
+			irq_on[1] &= ~irq_data->enable;
 			break;
 		case MAX8925_RTC_IRQ_MASK:
-			irq_rtc &= irq_data->enable;
+			irq_rtc &= ~irq_data->enable;
 			break;
 		case MAX8925_TSC_IRQ_MASK:
-			irq_tsc &= irq_data->enable;
+			irq_tsc &= ~irq_data->enable;
 			break;
 		default:
 			dev_err(chip->dev, "wrong IRQ\n");

drivers/mfd/wm831x-irq.c+7−2

 	irq = irq - wm831x->irq_base;
-	if (irq < WM831X_IRQ_GPIO_1 || irq > WM831X_IRQ_GPIO_11)
+	if (irq < WM831X_IRQ_GPIO_1 || irq > WM831X_IRQ_GPIO_11) {
-		return -EINVAL;
+		/* Ignore internal-only IRQs */
+		if (irq >= 0 && irq < WM831X_NUM_IRQS)
+			return 0;
+		else
+			return -EINVAL;
+	}
 	switch (type) {
 	case IRQ_TYPE_EDGE_BOTH:

drivers/misc/Kconfig+1−1

@@ -368,7 +368,7 @@ config VMWARE_BALLOON · 367 unmodified lines
368	If unsure, say N.	368	If unsure, say N.
369		369
370	To compile this driver as a module, choose M here: the	370	To compile this driver as a module, choose M here: the
371	module will be called vmware_balloon.	371	module will be called vmw_balloon.
372		372
373	config ARM_CHARLCD	373	config ARM_CHARLCD
374	bool "ARM Ltd. Character LCD Driver"	374	bool "ARM Ltd. Character LCD Driver"

drivers/misc/Makefile+1−1

@@ -33,5 +33,5 @@ obj-$(CONFIG_IWMC3200TOP) += iwmc3200top/ · 32 unmodified lines
33	obj-$(CONFIG_HMC6352) += hmc6352.o	33	obj-$(CONFIG_HMC6352) += hmc6352.o
34	obj-y += eeprom/	34	obj-y += eeprom/
35	obj-y += cb710/	35	obj-y += cb710/
36	obj-$(CONFIG_VMWARE_BALLOON) += vmware_balloon.o	36	obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o
37	obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o	37	obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o

drivers/misc/vmw_balloon.crenamed from drivers/misc/vmware_balloon.c+0−0

File renamed without changes.

drivers/mmc/host/sdhci-s3c.c+8−4

 static void sdhci_s3c_notify_change(struct platform_device *dev, int state)
 {
 	struct sdhci_host *host = platform_get_drvdata(dev);
+	unsigned long flags;
 	if (host) {
-		spin_lock(&host->lock);
+		spin_lock_irqsave(&host->lock, flags);
 		if (state) {
 			dev_dbg(&dev->dev, "card inserted.\n");
 			host->flags &= ~SDHCI_DEVICE_DEAD;
 			host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
 		}
 		tasklet_schedule(&host->card_tasklet);
-		spin_unlock(&host->lock);
+		spin_unlock_irqrestore(&host->lock, flags);
 	}
 }
 	sdhci_remove_host(host, 1);
 	for (ptr = 0; ptr < 3; ptr++) {
-		clk_disable(sc->clk_bus[ptr]);
+		if (sc->clk_bus[ptr]) {
-		clk_put(sc->clk_bus[ptr]);
+			clk_disable(sc->clk_bus[ptr]);
+			clk_put(sc->clk_bus[ptr]);
+		}
 	}
 	clk_disable(sc->clk_io);
 	clk_put(sc->clk_io);

drivers/mtd/nand/omap2.c+1−1

@@ -413,7 +413,7 @@ static inline int omap_nand_dma_transfer(struct mtd_info mtd, void addr, · 412 unmodified lines
413	prefetch_status = gpmc_read_status(GPMC_PREFETCH_COUNT);	413	prefetch_status = gpmc_read_status(GPMC_PREFETCH_COUNT);
414	} while (prefetch_status);	414	} while (prefetch_status);
415	/* disable and stop the PFPW engine */	415	/* disable and stop the PFPW engine */
416	gpmc_prefetch_reset();	416	gpmc_prefetch_reset(info->gpmc_cs);
417		417
418	dma_unmap_single(&info->pdev->dev, dma_addr, len, dir);	418	dma_unmap_single(&info->pdev->dev, dma_addr, len, dir);
419	return 0;	419	return 0;

drivers/net/3c59x.c+10−0

 {
 	struct vortex_private *vp = netdev_priv(dev);
+	if (!VORTEX_PCI(vp))
+		return;
 	wol->supported = WAKE_MAGIC;
 	wol->wolopts = 0;
 static int vortex_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
 	struct vortex_private *vp = netdev_priv(dev);
+	if (!VORTEX_PCI(vp))
+		return -EOPNOTSUPP;
 	if (wol->wolopts & ~WAKE_MAGIC)
 		return -EINVAL;
 			return;
 		}
+		if (VORTEX_PCI(vp)->current_state < PCI_D3hot)
+			return;
 		/* Change the power state to D3; RxEnable doesn't take effect. */
 		pci_set_power_state(VORTEX_PCI(vp), PCI_D3hot);
 	}

drivers/net/atlx/atl1.c+9−2

 	rrd_ring->desc = NULL;
 	rrd_ring->dma = 0;
+	adapter->cmb.dma = 0;
+	adapter->cmb.cmb = NULL;
+	adapter->smb.dma = 0;
+	adapter->smb.smb = NULL;
 }
 static void atl1_setup_mac_ctrl(struct atl1_adapter *adapter)
 	pci_enable_wake(pdev, PCI_D3cold, 0);
 	atl1_reset_hw(&adapter->hw);
-	adapter->cmb.cmb->int_stats = 0;
-	if (netif_running(netdev))
+	if (netif_running(netdev)) {
+		adapter->cmb.cmb->int_stats = 0;
 		atl1_up(adapter);
+	}
 	netif_device_attach(netdev);
 	return 0;

drivers/net/e1000e/hw.h+1−0

@@ -57,6 +57,7 @@ enum e1e_registers { · 56 unmodified lines
57	E1000_SCTL = 0x00024, /* SerDes Control - RW */	57	E1000_SCTL = 0x00024, /* SerDes Control - RW */
58	E1000_FCAL = 0x00028, /* Flow Control Address Low - RW */	58	E1000_FCAL = 0x00028, /* Flow Control Address Low - RW */
59	E1000_FCAH = 0x0002C, /* Flow Control Address High -RW */	59	E1000_FCAH = 0x0002C, /* Flow Control Address High -RW */
		60	E1000_FEXTNVM4 = 0x00024, /* Future Extended NVM 4 - RW */
60	E1000_FEXTNVM = 0x00028, /* Future Extended NVM - RW */	61	E1000_FEXTNVM = 0x00028, /* Future Extended NVM - RW */
61	E1000_FCT = 0x00030, /* Flow Control Type - RW */	62	E1000_FCT = 0x00030, /* Flow Control Type - RW */
62	E1000_VET = 0x00038, /* VLAN Ether Type - RW */	63	E1000_VET = 0x00038, /* VLAN Ether Type - RW */

drivers/net/e1000e/ich8lan.c+164−33

@@ -105,6 +105,10 @@ · 104 unmodified lines
105	#define E1000_FEXTNVM_SW_CONFIG 1	105	#define E1000_FEXTNVM_SW_CONFIG 1
106	#define E1000_FEXTNVM_SW_CONFIG_ICH8M (1 << 27) /* Bit redefined for ICH8M :/ */	106	#define E1000_FEXTNVM_SW_CONFIG_ICH8M (1 << 27) /* Bit redefined for ICH8M :/ */
107		107
		108	#define E1000_FEXTNVM4_BEACON_DURATION_MASK 0x7
		109	#define E1000_FEXTNVM4_BEACON_DURATION_8USEC 0x7
		110	#define E1000_FEXTNVM4_BEACON_DURATION_16USEC 0x3
		111
108	#define PCIE_ICH8_SNOOP_ALL PCIE_NO_SNOOP_ALL	112	#define PCIE_ICH8_SNOOP_ALL PCIE_NO_SNOOP_ALL
109		113
110	#define E1000_ICH_RAR_ENTRIES 7	114	#define E1000_ICH_RAR_ENTRIES 7
@@ -125,6 +129,7 @@ · 14 unmodified lines
125		129
126	/* SMBus Address Phy Register */	130	/* SMBus Address Phy Register */
127	#define HV_SMB_ADDR PHY_REG(768, 26)	131	#define HV_SMB_ADDR PHY_REG(768, 26)
		132	#define HV_SMB_ADDR_MASK 0x007F
128	#define HV_SMB_ADDR_PEC_EN 0x0200	133	#define HV_SMB_ADDR_PEC_EN 0x0200
129	#define HV_SMB_ADDR_VALID 0x0080	134	#define HV_SMB_ADDR_VALID 0x0080
130		135
@@ -237,6 +242,8 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link); · 106 unmodified lines
237	static s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw);	242	static s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw);
238	static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw);	243	static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw);
239	static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw);	244	static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw);
		245	static s32 e1000_k1_workaround_lv(struct e1000_hw *hw);
		246	static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate);
240		247
241	static inline u16 __er16flash(struct e1000_hw *hw, unsigned long reg)	248	static inline u16 __er16flash(struct e1000_hw *hw, unsigned long reg)
242	{	249	{
@@ -272,7 +279,7 @@ static inline void __ew32flash(struct e1000_hw *hw, unsigned long reg, u32 val) · 29 unmodified lines
272	static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)	279	static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
273	{	280	{
274	struct e1000_phy_info *phy = &hw->phy;	281	struct e1000_phy_info *phy = &hw->phy;
275	u32 ctrl;	282	u32 ctrl, fwsm;
276	s32 ret_val = 0;	283	s32 ret_val = 0;
277		284
278	phy->addr = 1;	285	phy->addr = 1;
@@ -294,7 +301,8 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw) · 15 unmodified lines
294	* disabled, then toggle the LANPHYPC Value bit to force	301	* disabled, then toggle the LANPHYPC Value bit to force
295	* the interconnect to PCIe mode.	302	* the interconnect to PCIe mode.
296	*/	303	*/
297	if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {	304	fwsm = er32(FWSM);
		305	if (!(fwsm & E1000_ICH_FWSM_FW_VALID)) {
298	ctrl = er32(CTRL);	306	ctrl = er32(CTRL);
299	ctrl \|= E1000_CTRL_LANPHYPC_OVERRIDE;	307	ctrl \|= E1000_CTRL_LANPHYPC_OVERRIDE;
300	ctrl &= ~E1000_CTRL_LANPHYPC_VALUE;	308	ctrl &= ~E1000_CTRL_LANPHYPC_VALUE;
@@ -303,6 +311,13 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw) · 2 unmodified lines
303	ctrl &= ~E1000_CTRL_LANPHYPC_OVERRIDE;	311	ctrl &= ~E1000_CTRL_LANPHYPC_OVERRIDE;
304	ew32(CTRL, ctrl);	312	ew32(CTRL, ctrl);
305	msleep(50);	313	msleep(50);
		314
		315	/*
		316	* Gate automatic PHY configuration by hardware on
		317	* non-managed 82579
		318	*/
		319	if (hw->mac.type == e1000_pch2lan)
		320	e1000_gate_hw_phy_config_ich8lan(hw, true);
306	}	321	}
307		322
308	/*	323	/*
@@ -315,6 +330,13 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw) · 6 unmodified lines
315	if (ret_val)	330	if (ret_val)
316	goto out;	331	goto out;
317		332
		333	/* Ungate automatic PHY configuration on non-managed 82579 */
		334	if ((hw->mac.type == e1000_pch2lan) &&
		335	!(fwsm & E1000_ICH_FWSM_FW_VALID)) {
		336	msleep(10);
		337	e1000_gate_hw_phy_config_ich8lan(hw, false);
		338	}
		339
318	phy->id = e1000_phy_unknown;	340	phy->id = e1000_phy_unknown;
319	ret_val = e1000e_get_phy_id(hw);	341	ret_val = e1000e_get_phy_id(hw);
320	if (ret_val)	342	if (ret_val)
@@ -561,13 +583,10 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter) · 240 unmodified lines
561	if (mac->type == e1000_ich8lan)	583	if (mac->type == e1000_ich8lan)
562	e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw, true);	584	e1000e_set_kmrn_lock_loss_workaround_ich8lan(hw, true);
563		585
564	/* Disable PHY configuration by hardware, config by software */	586	/* Gate automatic PHY configuration by hardware on managed 82579 */
565	if (mac->type == e1000_pch2lan) {	587	if ((mac->type == e1000_pch2lan) &&
566	u32 extcnf_ctrl = er32(EXTCNF_CTRL);	588	(er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
567		589	e1000_gate_hw_phy_config_ich8lan(hw, true);
568	extcnf_ctrl \|= E1000_EXTCNF_CTRL_GATE_PHY_CFG;
569	ew32(EXTCNF_CTRL, extcnf_ctrl);
570	}
571		590
572	return 0;	591	return 0;
573	}	592	}
@@ -652,6 +671,12 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) · 78 unmodified lines
652	goto out;	671	goto out;
653	}	672	}
654		673
		674	if (hw->mac.type == e1000_pch2lan) {
		675	ret_val = e1000_k1_workaround_lv(hw);
		676	if (ret_val)
		677	goto out;
		678	}
		679
655	/*	680	/*
656	* Check if there was DownShift, must be checked	681	* Check if there was DownShift, must be checked
657	* immediately after link-up	682	* immediately after link-up
@@ -894,6 +919,34 @@ static s32 e1000_check_reset_block_ich8lan(struct e1000_hw *hw) · 236 unmodified lines
894	return (fwsm & E1000_ICH_FWSM_RSPCIPHY) ? 0 : E1000_BLK_PHY_RESET;	919	return (fwsm & E1000_ICH_FWSM_RSPCIPHY) ? 0 : E1000_BLK_PHY_RESET;
895	}	920	}
896		921
		922	/**
		923	* e1000_write_smbus_addr - Write SMBus address to PHY needed during Sx states
		924	* @hw: pointer to the HW structure
		925	*
		926	* Assumes semaphore already acquired.
		927	*
		928	**/
		929	static s32 e1000_write_smbus_addr(struct e1000_hw *hw)
		930	{
		931	u16 phy_data;
		932	u32 strap = er32(STRAP);
		933	s32 ret_val = 0;
		934
		935	strap &= E1000_STRAP_SMBUS_ADDRESS_MASK;
		936
		937	ret_val = e1000_read_phy_reg_hv_locked(hw, HV_SMB_ADDR, &phy_data);
		938	if (ret_val)
		939	goto out;
		940
		941	phy_data &= ~HV_SMB_ADDR_MASK;
		942	phy_data \|= (strap >> E1000_STRAP_SMBUS_ADDRESS_SHIFT);
		943	phy_data \|= HV_SMB_ADDR_PEC_EN \| HV_SMB_ADDR_VALID;
		944	ret_val = e1000_write_phy_reg_hv_locked(hw, HV_SMB_ADDR, phy_data);
		945
		946	out:
		947	return ret_val;
		948	}
		949
897	/**	950	/**
898	* e1000_sw_lcd_config_ich8lan - SW-based LCD Configuration	951	* e1000_sw_lcd_config_ich8lan - SW-based LCD Configuration
899	* @hw: pointer to the HW structure	952	* @hw: pointer to the HW structure
@@ -903,7 +956,6 @@ static s32 e1000_check_reset_block_ich8lan(struct e1000_hw *hw) · 3 unmodified lines
903	**/	956	**/
904	static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)	957	static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
905	{	958	{
906	struct e1000_adapter *adapter = hw->adapter;
907	struct e1000_phy_info *phy = &hw->phy;	959	struct e1000_phy_info *phy = &hw->phy;
908	u32 i, data, cnf_size, cnf_base_addr, sw_cfg_mask;	960	u32 i, data, cnf_size, cnf_base_addr, sw_cfg_mask;
909	s32 ret_val = 0;	961	s32 ret_val = 0;
@@ -921,7 +973,8 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw) · 11 unmodified lines
921	if (phy->type != e1000_phy_igp_3)	973	if (phy->type != e1000_phy_igp_3)
922	return ret_val;	974	return ret_val;
923		975
924	if (adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_AMT) {	976	if ((hw->adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_AMT) \|\|
		977	(hw->adapter->pdev->device == E1000_DEV_ID_ICH8_IGP_C)) {
925	sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG;	978	sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG;
926	break;	979	break;
927	}	980	}
@@ -961,21 +1014,16 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw) · 33 unmodified lines
961	cnf_base_addr = data & E1000_EXTCNF_CTRL_EXT_CNF_POINTER_MASK;	1014	cnf_base_addr = data & E1000_EXTCNF_CTRL_EXT_CNF_POINTER_MASK;
962	cnf_base_addr >>= E1000_EXTCNF_CTRL_EXT_CNF_POINTER_SHIFT;	1015	cnf_base_addr >>= E1000_EXTCNF_CTRL_EXT_CNF_POINTER_SHIFT;
963		1016
964	if (!(data & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE) &&	1017	if ((!(data & E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE) &&
965	((hw->mac.type == e1000_pchlan) \|\|	1018	(hw->mac.type == e1000_pchlan)) \|\|
966	(hw->mac.type == e1000_pch2lan))) {	1019	(hw->mac.type == e1000_pch2lan)) {
967	/*	1020	/*
968	* HW configures the SMBus address and LEDs when the	1021	* HW configures the SMBus address and LEDs when the
969	* OEM and LCD Write Enable bits are set in the NVM.	1022	* OEM and LCD Write Enable bits are set in the NVM.
970	* When both NVM bits are cleared, SW will configure	1023	* When both NVM bits are cleared, SW will configure
971	* them instead.	1024	* them instead.
972	*/	1025	*/
973	data = er32(STRAP);	1026	ret_val = e1000_write_smbus_addr(hw);
974	data &= E1000_STRAP_SMBUS_ADDRESS_MASK;
975	reg_data = data >> E1000_STRAP_SMBUS_ADDRESS_SHIFT;
976	reg_data \|= HV_SMB_ADDR_PEC_EN \| HV_SMB_ADDR_VALID;
977	ret_val = e1000_write_phy_reg_hv_locked(hw, HV_SMB_ADDR,
978	reg_data);
979	if (ret_val)	1027	if (ret_val)
980	goto out;	1028	goto out;
981		1029
@@ -1440,10 +1488,6 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable) · 458 unmodified lines
1440	goto out;	1488	goto out;
1441		1489
1442	/* Enable jumbo frame workaround in the PHY */	1490	/* Enable jumbo frame workaround in the PHY */
1443	e1e_rphy(hw, PHY_REG(769, 20), &data);
1444	ret_val = e1e_wphy(hw, PHY_REG(769, 20), data & ~(1 << 14));
1445	if (ret_val)
1446	goto out;
1447	e1e_rphy(hw, PHY_REG(769, 23), &data);	1491	e1e_rphy(hw, PHY_REG(769, 23), &data);
1448	data &= ~(0x7F << 5);	1492	data &= ~(0x7F << 5);
1449	data \|= (0x37 << 5);	1493	data \|= (0x37 << 5);
@@ -1452,7 +1496,6 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable) · 2 unmodified lines
1452	goto out;	1496	goto out;
1453	e1e_rphy(hw, PHY_REG(769, 16), &data);	1497	e1e_rphy(hw, PHY_REG(769, 16), &data);
1454	data &= ~(1 << 13);	1498	data &= ~(1 << 13);
1455	data \|= (1 << 12);
1456	ret_val = e1e_wphy(hw, PHY_REG(769, 16), data);	1499	ret_val = e1e_wphy(hw, PHY_REG(769, 16), data);
1457	if (ret_val)	1500	if (ret_val)
1458	goto out;	1501	goto out;
@@ -1477,7 +1520,7 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable) · 18 unmodified lines
1477		1520
1478	mac_reg = er32(RCTL);	1521	mac_reg = er32(RCTL);
1479	mac_reg &= ~E1000_RCTL_SECRC;	1522	mac_reg &= ~E1000_RCTL_SECRC;
1480	ew32(FFLT_DBG, mac_reg);	1523	ew32(RCTL, mac_reg);
1481		1524
1482	ret_val = e1000e_read_kmrn_reg(hw,	1525	ret_val = e1000e_read_kmrn_reg(hw,
1483	E1000_KMRNCTRLSTA_CTRL_OFFSET,	1526	E1000_KMRNCTRLSTA_CTRL_OFFSET,
@@ -1503,17 +1546,12 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable) · 19 unmodified lines
1503	goto out;	1546	goto out;
1504		1547
1505	/* Write PHY register values back to h/w defaults */	1548	/* Write PHY register values back to h/w defaults */
1506	e1e_rphy(hw, PHY_REG(769, 20), &data);
1507	ret_val = e1e_wphy(hw, PHY_REG(769, 20), data & ~(1 << 14));
1508	if (ret_val)
1509	goto out;
1510	e1e_rphy(hw, PHY_REG(769, 23), &data);	1549	e1e_rphy(hw, PHY_REG(769, 23), &data);
1511	data &= ~(0x7F << 5);	1550	data &= ~(0x7F << 5);
1512	ret_val = e1e_wphy(hw, PHY_REG(769, 23), data);	1551	ret_val = e1e_wphy(hw, PHY_REG(769, 23), data);
1513	if (ret_val)	1552	if (ret_val)
1514	goto out;	1553	goto out;
1515	e1e_rphy(hw, PHY_REG(769, 16), &data);	1554	e1e_rphy(hw, PHY_REG(769, 16), &data);
1516	data &= ~(1 << 12);
1517	data \|= (1 << 13);	1555	data \|= (1 << 13);
1518	ret_val = e1e_wphy(hw, PHY_REG(769, 16), data);	1556	ret_val = e1e_wphy(hw, PHY_REG(769, 16), data);
1519	if (ret_val)	1557	if (ret_val)
@@ -1558,6 +1596,69 @@ out: · 38 unmodified lines
1558	return ret_val;	1596	return ret_val;
1559	}	1597	}
1560		1598
		1599	/**
		1600	* e1000_k1_gig_workaround_lv - K1 Si workaround
		1601	* @hw: pointer to the HW structure
		1602	*
		1603	* Workaround to set the K1 beacon duration for 82579 parts
		1604	**/
		1605	static s32 e1000_k1_workaround_lv(struct e1000_hw *hw)
		1606	{
		1607	s32 ret_val = 0;
		1608	u16 status_reg = 0;
		1609	u32 mac_reg;
		1610
		1611	if (hw->mac.type != e1000_pch2lan)
		1612	goto out;
		1613
		1614	/* Set K1 beacon duration based on 1Gbps speed or otherwise */
		1615	ret_val = e1e_rphy(hw, HV_M_STATUS, &status_reg);
		1616	if (ret_val)
		1617	goto out;
		1618
		1619	if ((status_reg & (HV_M_STATUS_LINK_UP \| HV_M_STATUS_AUTONEG_COMPLETE))
		1620	== (HV_M_STATUS_LINK_UP \| HV_M_STATUS_AUTONEG_COMPLETE)) {
		1621	mac_reg = er32(FEXTNVM4);
		1622	mac_reg &= ~E1000_FEXTNVM4_BEACON_DURATION_MASK;
		1623
		1624	if (status_reg & HV_M_STATUS_SPEED_1000)
		1625	mac_reg \|= E1000_FEXTNVM4_BEACON_DURATION_8USEC;
		1626	else
		1627	mac_reg \|= E1000_FEXTNVM4_BEACON_DURATION_16USEC;
		1628
		1629	ew32(FEXTNVM4, mac_reg);
		1630	}
		1631
		1632	out:
		1633	return ret_val;
		1634	}
		1635
		1636	/**
		1637	* e1000_gate_hw_phy_config_ich8lan - disable PHY config via hardware
		1638	* @hw: pointer to the HW structure
		1639	* @gate: boolean set to true to gate, false to ungate
		1640	*
		1641	* Gate/ungate the automatic PHY configuration via hardware; perform
		1642	* the configuration via software instead.
		1643	**/
		1644	static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate)
		1645	{
		1646	u32 extcnf_ctrl;
		1647
		1648	if (hw->mac.type != e1000_pch2lan)
		1649	return;
		1650
		1651	extcnf_ctrl = er32(EXTCNF_CTRL);
		1652
		1653	if (gate)
		1654	extcnf_ctrl \|= E1000_EXTCNF_CTRL_GATE_PHY_CFG;
		1655	else
		1656	extcnf_ctrl &= ~E1000_EXTCNF_CTRL_GATE_PHY_CFG;
		1657
		1658	ew32(EXTCNF_CTRL, extcnf_ctrl);
		1659	return;
		1660	}
		1661
1561	/**	1662	/**
1562	* e1000_lan_init_done_ich8lan - Check for PHY config completion	1663	* e1000_lan_init_done_ich8lan - Check for PHY config completion
1563	* @hw: pointer to the HW structure	1664	* @hw: pointer to the HW structure
@@ -1602,6 +1703,9 @@ static s32 e1000_post_phy_reset_ich8lan(struct e1000_hw *hw) · 38 unmodified lines
1602	if (e1000_check_reset_block(hw))	1703	if (e1000_check_reset_block(hw))
1603	goto out;	1704	goto out;
1604		1705
		1706	/* Allow time for h/w to get to quiescent state after reset */
		1707	msleep(10);
		1708
1605	/* Perform any necessary post-reset workarounds */	1709	/* Perform any necessary post-reset workarounds */
1606	switch (hw->mac.type) {	1710	switch (hw->mac.type) {
1607	case e1000_pchlan:	1711	case e1000_pchlan:
@@ -1630,6 +1734,13 @@ static s32 e1000_post_phy_reset_ich8lan(struct e1000_hw *hw) · 22 unmodified lines
1630	/* Configure the LCD with the OEM bits in NVM */	1734	/* Configure the LCD with the OEM bits in NVM */
1631	ret_val = e1000_oem_bits_config_ich8lan(hw, true);	1735	ret_val = e1000_oem_bits_config_ich8lan(hw, true);
1632		1736
		1737	/* Ungate automatic PHY configuration on non-managed 82579 */
		1738	if ((hw->mac.type == e1000_pch2lan) &&
		1739	!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {
		1740	msleep(10);
		1741	e1000_gate_hw_phy_config_ich8lan(hw, false);
		1742	}
		1743
1633	out:	1744	out:
1634	return ret_val;	1745	return ret_val;
1635	}	1746	}
@@ -1646,6 +1757,11 @@ static s32 e1000_phy_hw_reset_ich8lan(struct e1000_hw *hw) · 10 unmodified lines
1646	{	1757	{
1647	s32 ret_val = 0;	1758	s32 ret_val = 0;
1648		1759
		1760	/* Gate automatic PHY configuration by hardware on non-managed 82579 */
		1761	if ((hw->mac.type == e1000_pch2lan) &&
		1762	!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
		1763	e1000_gate_hw_phy_config_ich8lan(hw, true);
		1764
1649	ret_val = e1000e_phy_hw_reset_generic(hw);	1765	ret_val = e1000e_phy_hw_reset_generic(hw);
1650	if (ret_val)	1766	if (ret_val)
1651	goto out;	1767	goto out;
@@ -2910,6 +3026,14 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw) · 1258 unmodified lines
2910	* external PHY is reset.	3026	* external PHY is reset.
2911	*/	3027	*/
2912	ctrl \|= E1000_CTRL_PHY_RST;	3028	ctrl \|= E1000_CTRL_PHY_RST;
		3029
		3030	/*
		3031	* Gate automatic PHY configuration by hardware on
		3032	* non-managed 82579
		3033	*/
		3034	if ((hw->mac.type == e1000_pch2lan) &&
		3035	!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID))
		3036	e1000_gate_hw_phy_config_ich8lan(hw, true);
2913	}	3037	}
2914	ret_val = e1000_acquire_swflag_ich8lan(hw);	3038	ret_val = e1000_acquire_swflag_ich8lan(hw);
2915	e_dbg("Issuing a global reset to ich8lan\n");	3039	e_dbg("Issuing a global reset to ich8lan\n");
@@ -3460,13 +3584,20 @@ void e1000e_gig_downshift_workaround_ich8lan(struct e1000_hw *hw) · 544 unmodified lines
3460	void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw)	3584	void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw)
3461	{	3585	{
3462	u32 phy_ctrl;	3586	u32 phy_ctrl;
		3587	s32 ret_val;
3463		3588
3464	phy_ctrl = er32(PHY_CTRL);	3589	phy_ctrl = er32(PHY_CTRL);
3465	phy_ctrl \|= E1000_PHY_CTRL_D0A_LPLU \| E1000_PHY_CTRL_GBE_DISABLE;	3590	phy_ctrl \|= E1000_PHY_CTRL_D0A_LPLU \| E1000_PHY_CTRL_GBE_DISABLE;
3466	ew32(PHY_CTRL, phy_ctrl);	3591	ew32(PHY_CTRL, phy_ctrl);
3467		3592
3468	if (hw->mac.type >= e1000_pchlan)	3593	if (hw->mac.type >= e1000_pchlan) {
3469	e1000_phy_hw_reset_ich8lan(hw);	3594	e1000_oem_bits_config_ich8lan(hw, true);
		3595	ret_val = hw->phy.ops.acquire(hw);
		3596	if (ret_val)
		3597	return;
		3598	e1000_write_smbus_addr(hw);
		3599	hw->phy.ops.release(hw);
		3600	}
3470	}	3601	}
3471		3602
3472	/**	3603	/**

drivers/net/e1000e/netdev.c+19−10

 	u32 psrctl = 0;
 	u32 pages = 0;
+	/* Workaround Si errata on 82579 - configure jumbo frame flow */
+	if (hw->mac.type == e1000_pch2lan) {
+		s32 ret_val;
+		if (adapter->netdev->mtu > ETH_DATA_LEN)
+			ret_val = e1000_lv_jumbo_workaround_ich8lan(hw, true);
+		else
+			ret_val = e1000_lv_jumbo_workaround_ich8lan(hw, false);
+	}
 	/* Program MC offset vector base */
 	rctl = er32(RCTL);
 	rctl &= ~(3 << E1000_RCTL_MO_SHIFT);
 		e1e_wphy(hw, 22, phy_data);
 	}
-	/* Workaround Si errata on 82579 - configure jumbo frame flow */
-	if (hw->mac.type == e1000_pch2lan) {
-		s32 ret_val;
-		if (rctl & E1000_RCTL_LPE)
-			ret_val = e1000_lv_jumbo_workaround_ich8lan(hw, true);
-		else
-			ret_val = e1000_lv_jumbo_workaround_ich8lan(hw, false);
-	}
 	/* Setup buffer sizes */
 	rctl &= ~E1000_RCTL_SZ_4096;
 	rctl |= E1000_RCTL_BSEX;
 		return -EINVAL;
 	}
+	/* Jumbo frame workaround on 82579 requires CRC be stripped */
+	if ((adapter->hw.mac.type == e1000_pch2lan) &&
+	    !(adapter->flags2 & FLAG2_CRC_STRIPPING) &&
+	    (new_mtu > ETH_DATA_LEN)) {
+		e_err("Jumbo Frames not supported on 82579 when CRC "
+		      "stripping is disabled.\n");
+		return -EINVAL;
+	}
 	/* 82573 Errata 17 */
 	if (((adapter->hw.mac.type == e1000_82573) ||
 	     (adapter->hw.mac.type == e1000_82574)) &&

drivers/net/ibm_newemac/core.c+2−2

@@ -2928,7 +2928,7 @@ static int __devinit emac_probe(struct platform_device *ofdev, · 2927 unmodified lines
2928	if (dev->emac_irq != NO_IRQ)	2928	if (dev->emac_irq != NO_IRQ)
2929	irq_dispose_mapping(dev->emac_irq);	2929	irq_dispose_mapping(dev->emac_irq);
2930	err_free:	2930	err_free:
2931	kfree(ndev);	2931	free_netdev(ndev);
2932	err_gone:	2932	err_gone:
2933	/* if we were on the bootlist, remove us as we won't show up and	2933	/* if we were on the bootlist, remove us as we won't show up and
2934	* wake up all waiters to notify them in case they were waiting	2934	* wake up all waiters to notify them in case they were waiting
@@ -2971,7 +2971,7 @@ static int __devexit emac_remove(struct platform_device *ofdev) · 36 unmodified lines
2971	if (dev->emac_irq != NO_IRQ)	2971	if (dev->emac_irq != NO_IRQ)
2972	irq_dispose_mapping(dev->emac_irq);	2972	irq_dispose_mapping(dev->emac_irq);
2973		2973
2974	kfree(dev->ndev);	2974	free_netdev(dev->ndev);
2975		2975
2976	return 0;	2976	return 0;
2977	}	2977	}

drivers/net/netxen/netxen_nic_init.c+0−3

 	if (pkt_offset)
 		skb_pull(skb, pkt_offset);
-	skb->truesize = skb->len + sizeof(struct sk_buff);
 	skb->protocol = eth_type_trans(skb, netdev);
 	napi_gro_receive(&sds_ring->napi, skb);
 	skb_put(skb, lro_length + data_offset);
-	skb->truesize = skb->len + sizeof(struct sk_buff) + skb_headroom(skb);
 	skb_pull(skb, l2_hdr_offset);
 	skb->protocol = eth_type_trans(skb, netdev);

drivers/net/qlcnic/qlcnic_init.c+1−6

 		return -ENOMEM;
 	}
-	skb_reserve(skb, 2);
+	skb_reserve(skb, NET_IP_ALIGN);
 	dma = pci_map_single(pdev, skb->data,
 			rds_ring->dma_size, PCI_DMA_FROMDEVICE);
 	if (pkt_offset)
 		skb_pull(skb, pkt_offset);
-	skb->truesize = skb->len + sizeof(struct sk_buff);
 	skb->protocol = eth_type_trans(skb, netdev);
 	napi_gro_receive(&sds_ring->napi, skb);
 	skb_put(skb, lro_length + data_offset);
-	skb->truesize = skb->len + sizeof(struct sk_buff) + skb_headroom(skb);
 	skb_pull(skb, l2_hdr_offset);
 	skb->protocol = eth_type_trans(skb, netdev);
 	if (pkt_offset)
 		skb_pull(skb, pkt_offset);
-	skb->truesize = skb->len + sizeof(struct sk_buff);
 	if (!qlcnic_check_loopback_buff(skb->data))
 		adapter->diag_cnt++;

drivers/net/rionet.c+1−1

@@ -384,7 +384,7 @@ static void rionet_remove(struct rio_dev *rdev) · 383 unmodified lines
384	free_pages((unsigned long)rionet_active, rdev->net->hport->sys_size ?	384	free_pages((unsigned long)rionet_active, rdev->net->hport->sys_size ?
385	__ilog2(sizeof(void *)) + 4 : 0);	385	__ilog2(sizeof(void *)) + 4 : 0);
386	unregister_netdev(ndev);	386	unregister_netdev(ndev);
387	kfree(ndev);	387	free_netdev(ndev);
388		388
389	list_for_each_entry_safe(peer, tmp, &rionet_peers, node) {	389	list_for_each_entry_safe(peer, tmp, &rionet_peers, node) {
390	list_del(&peer->node);	390	list_del(&peer->node);

drivers/net/sgiseeq.c+1−1

@@ -804,7 +804,7 @@ static int __devinit sgiseeq_probe(struct platform_device *pdev) · 803 unmodified lines
804	err_out_free_page:	804	err_out_free_page:
805	free_page((unsigned long) sp->srings);	805	free_page((unsigned long) sp->srings);
806	err_out_free_dev:	806	err_out_free_dev:
807	kfree(dev);	807	free_netdev(dev);
808		808
809	err_out:	809	err_out:
810	return err;	810	return err;

drivers/net/smsc911x.c+1−0

@@ -58,6 +58,7 @@ · 57 unmodified lines
58		58
59	MODULE_LICENSE("GPL");	59	MODULE_LICENSE("GPL");
60	MODULE_VERSION(SMSC_DRV_VERSION);	60	MODULE_VERSION(SMSC_DRV_VERSION);
		61	MODULE_ALIAS("platform:smsc911x");
61		62
62	#if USE_DEBUG > 0	63	#if USE_DEBUG > 0
63	static int debug = 16;	64	static int debug = 16;

drivers/net/tulip/de2104x.c+38−5

@@ -243,6 +243,7 @@ enum { · 242 unmodified lines
243	NWayState = (1 << 14) \| (1 << 13) \| (1 << 12),	243	NWayState = (1 << 14) \| (1 << 13) \| (1 << 12),
244	NWayRestart = (1 << 12),	244	NWayRestart = (1 << 12),
245	NonselPortActive = (1 << 9),	245	NonselPortActive = (1 << 9),
		246	SelPortActive = (1 << 8),
246	LinkFailStatus = (1 << 2),	247	LinkFailStatus = (1 << 2),
247	NetCxnErr = (1 << 1),	248	NetCxnErr = (1 << 1),
248	};	249	};
@@ -363,7 +364,9 @@ static u16 t21040_csr15[] = { 0, 0, 0x0006, 0x0000, 0x0000, }; · 114 unmodified lines
363		364
364	/* 21041 transceiver register settings: TP AUTO, BNC, AUI, TP, TP FD*/	365	/* 21041 transceiver register settings: TP AUTO, BNC, AUI, TP, TP FD*/
365	static u16 t21041_csr13[] = { 0xEF01, 0xEF09, 0xEF09, 0xEF01, 0xEF09, };	366	static u16 t21041_csr13[] = { 0xEF01, 0xEF09, 0xEF09, 0xEF01, 0xEF09, };
366	static u16 t21041_csr14[] = { 0xFFFF, 0xF7FD, 0xF7FD, 0x6F3F, 0x6F3D, };	367	static u16 t21041_csr14[] = { 0xFFFF, 0xF7FD, 0xF7FD, 0x7F3F, 0x7F3D, };
		368	/* If on-chip autonegotiation is broken, use half-duplex (FF3F) instead */
		369	static u16 t21041_csr14_brk[] = { 0xFF3F, 0xF7FD, 0xF7FD, 0x7F3F, 0x7F3D, };
367	static u16 t21041_csr15[] = { 0x0008, 0x0006, 0x000E, 0x0008, 0x0008, };	370	static u16 t21041_csr15[] = { 0x0008, 0x0006, 0x000E, 0x0008, 0x0008, };
368		371
369		372
@@ -1064,6 +1067,9 @@ static void de21041_media_timer (unsigned long data) · 694 unmodified lines
1064	unsigned int carrier;	1067	unsigned int carrier;
1065	unsigned long flags;	1068	unsigned long flags;
1066		1069
		1070	/* clear port active bits */
		1071	dw32(SIAStatus, NonselPortActive \| SelPortActive);
		1072
1067	carrier = (status & NetCxnErr) ? 0 : 1;	1073	carrier = (status & NetCxnErr) ? 0 : 1;
1068		1074
1069	if (carrier) {	1075	if (carrier) {
@@ -1158,14 +1164,29 @@ no_link_yet: · 88 unmodified lines
1158	static void de_media_interrupt (struct de_private *de, u32 status)	1164	static void de_media_interrupt (struct de_private *de, u32 status)
1159	{	1165	{
1160	if (status & LinkPass) {	1166	if (status & LinkPass) {
		1167	/* Ignore if current media is AUI or BNC and we can't use TP */
		1168	if ((de->media_type == DE_MEDIA_AUI \|\|
		1169	de->media_type == DE_MEDIA_BNC) &&
		1170	(de->media_lock \|\|
		1171	!de_ok_to_advertise(de, DE_MEDIA_TP_AUTO)))
		1172	return;
		1173	/* If current media is not TP, change it to TP */
		1174	if ((de->media_type == DE_MEDIA_AUI \|\|
		1175	de->media_type == DE_MEDIA_BNC)) {
		1176	de->media_type = DE_MEDIA_TP_AUTO;
		1177	de_stop_rxtx(de);
		1178	de_set_media(de);
		1179	de_start_rxtx(de);
		1180	}
1161	de_link_up(de);	1181	de_link_up(de);
1162	mod_timer(&de->media_timer, jiffies + DE_TIMER_LINK);	1182	mod_timer(&de->media_timer, jiffies + DE_TIMER_LINK);
1163	return;	1183	return;
1164	}	1184	}
1165		1185
1166	BUG_ON(!(status & LinkFail));	1186	BUG_ON(!(status & LinkFail));
1167		1187	/* Mark the link as down only if current media is TP */
1168	if (netif_carrier_ok(de->dev)) {	1188	if (netif_carrier_ok(de->dev) && de->media_type != DE_MEDIA_AUI &&
		1189	de->media_type != DE_MEDIA_BNC) {
1169	de_link_down(de);	1190	de_link_down(de);
1170	mod_timer(&de->media_timer, jiffies + DE_TIMER_NO_LINK);	1191	mod_timer(&de->media_timer, jiffies + DE_TIMER_NO_LINK);
1171	}	1192	}
@@ -1229,6 +1250,7 @@ static void de_adapter_sleep (struct de_private *de) · 57 unmodified lines
1229	if (de->de21040)	1250	if (de->de21040)
1230	return;	1251	return;
1231		1252
		1253	dw32(CSR13, 0); /* Reset phy */
1232	pci_read_config_dword(de->pdev, PCIPM, &pmctl);	1254	pci_read_config_dword(de->pdev, PCIPM, &pmctl);
1233	pmctl \|= PM_Sleep;	1255	pmctl \|= PM_Sleep;
1234	pci_write_config_dword(de->pdev, PCIPM, pmctl);	1256	pci_write_config_dword(de->pdev, PCIPM, pmctl);
@@ -1574,12 +1596,15 @@ static int __de_set_settings(struct de_private de, struct ethtool_cmd ecmd) · 339 unmodified lines
1574	return 0; /* nothing to change */	1596	return 0; /* nothing to change */
1575		1597
1576	de_link_down(de);	1598	de_link_down(de);
		1599	mod_timer(&de->media_timer, jiffies + DE_TIMER_NO_LINK);
1577	de_stop_rxtx(de);	1600	de_stop_rxtx(de);
1578		1601
1579	de->media_type = new_media;	1602	de->media_type = new_media;
1580	de->media_lock = media_lock;	1603	de->media_lock = media_lock;
1581	de->media_advertise = ecmd->advertising;	1604	de->media_advertise = ecmd->advertising;
1582	de_set_media(de);	1605	de_set_media(de);
		1606	if (netif_running(de->dev))
		1607	de_start_rxtx(de);
1583		1608
1584	return 0;	1609	return 0;
1585	}	1610	}
@@ -1911,8 +1936,14 @@ fill_defaults: · 325 unmodified lines
1911	for (i = 0; i < DE_MAX_MEDIA; i++) {	1936	for (i = 0; i < DE_MAX_MEDIA; i++) {
1912	if (de->media[i].csr13 == 0xffff)	1937	if (de->media[i].csr13 == 0xffff)
1913	de->media[i].csr13 = t21041_csr13[i];	1938	de->media[i].csr13 = t21041_csr13[i];
1914	if (de->media[i].csr14 == 0xffff)	1939	if (de->media[i].csr14 == 0xffff) {
1915	de->media[i].csr14 = t21041_csr14[i];	1940	/* autonegotiation is broken at least on some chip
		1941	revisions - rev. 0x21 works, 0x11 does not */
		1942	if (de->pdev->revision < 0x20)
		1943	de->media[i].csr14 = t21041_csr14_brk[i];
		1944	else
		1945	de->media[i].csr14 = t21041_csr14[i];
		1946	}
1916	if (de->media[i].csr15 == 0xffff)	1947	if (de->media[i].csr15 == 0xffff)
1917	de->media[i].csr15 = t21041_csr15[i];	1948	de->media[i].csr15 = t21041_csr15[i];
1918	}	1949	}
@@ -2158,6 +2189,8 @@ static int de_resume (struct pci_dev *pdev) · 239 unmodified lines
2158	dev_err(&dev->dev, "pci_enable_device failed in resume\n");	2189	dev_err(&dev->dev, "pci_enable_device failed in resume\n");
2159	goto out;	2190	goto out;
2160	}	2191	}
		2192	pci_set_master(pdev);
		2193	de_init_rings(de);
2161	de_init_hw(de);	2194	de_init_hw(de);
2162	out_attach:	2195	out_attach:
2163	netif_device_attach(dev);	2196	netif_device_attach(dev);

drivers/net/wireless/iwlwifi/iwl-agn-lib.c+1−1

@@ -1411,7 +1411,7 @@ void iwlagn_request_scan(struct iwl_priv priv, struct ieee80211_vif vif) · 1410 unmodified lines
1411	clear_bit(STATUS_SCAN_HW, &priv->status);	1411	clear_bit(STATUS_SCAN_HW, &priv->status);
1412	clear_bit(STATUS_SCANNING, &priv->status);	1412	clear_bit(STATUS_SCANNING, &priv->status);
1413	/* inform mac80211 scan aborted */	1413	/* inform mac80211 scan aborted */
1414	queue_work(priv->workqueue, &priv->scan_completed);	1414	queue_work(priv->workqueue, &priv->abort_scan);
1415	}	1415	}
1416		1416
1417	int iwlagn_manage_ibss_station(struct iwl_priv *priv,	1417	int iwlagn_manage_ibss_station(struct iwl_priv *priv,

drivers/net/wireless/iwlwifi/iwl-core.c+5−0

 	if (test_bit(STATUS_EXIT_PENDING, &priv->status))
 		return -EINVAL;
+	if (test_bit(STATUS_SCANNING, &priv->status)) {
+		IWL_DEBUG_INFO(priv, "scan in progress.\n");
+		return -EINVAL;
+	}
 	if (mode >= IWL_MAX_FORCE_RESET) {
 		IWL_DEBUG_INFO(priv, "invalid reset request.\n");
 		return -EINVAL;

drivers/net/wireless/iwlwifi/iwl3945-base.c+1−1

@@ -3018,7 +3018,7 @@ void iwl3945_request_scan(struct iwl_priv priv, struct ieee80211_vif vif) · 3017 unmodified lines
3018	clear_bit(STATUS_SCANNING, &priv->status);	3018	clear_bit(STATUS_SCANNING, &priv->status);
3019		3019
3020	/* inform mac80211 scan aborted */	3020	/* inform mac80211 scan aborted */
3021	queue_work(priv->workqueue, &priv->scan_completed);	3021	queue_work(priv->workqueue, &priv->abort_scan);
3022	}	3022	}
3023		3023
3024	static void iwl3945_bg_restart(struct work_struct *data)	3024	static void iwl3945_bg_restart(struct work_struct *data)

drivers/pci/intel-iommu.c+70−47

 #define DMA_32BIT_PFN		IOVA_PFN(DMA_BIT_MASK(32))
 #define DMA_64BIT_PFN		IOVA_PFN(DMA_BIT_MASK(64))
+/* page table handling */
+#define LEVEL_STRIDE		(9)
+#define LEVEL_MASK		(((u64)1 << LEVEL_STRIDE) - 1)
+static inline int agaw_to_level(int agaw)
+{
+	return agaw + 2;
+}
+static inline int agaw_to_width(int agaw)
+{
+	return 30 + agaw * LEVEL_STRIDE;
+}
+static inline int width_to_agaw(int width)
+{
+	return (width - 30) / LEVEL_STRIDE;
+}
+static inline unsigned int level_to_offset_bits(int level)
+{
+	return (level - 1) * LEVEL_STRIDE;
+}
+static inline int pfn_level_offset(unsigned long pfn, int level)
+{
+	return (pfn >> level_to_offset_bits(level)) & LEVEL_MASK;
+}
+static inline unsigned long level_mask(int level)
+{
+	return -1UL << level_to_offset_bits(level);
+}
+static inline unsigned long level_size(int level)
+{
+	return 1UL << level_to_offset_bits(level);
+}
+static inline unsigned long align_to_level(unsigned long pfn, int level)
+{
+	return (pfn + level_size(level) - 1) & level_mask(level);
+}
 /* VT-d pages must always be _smaller_ than MM pages. Otherwise things
    are never going to work. */
 }
-static inline int width_to_agaw(int width);
 static int __iommu_calculate_agaw(struct intel_iommu *iommu, int max_gaw)
 {
 	unsigned long sagaw;
 	spin_unlock_irqrestore(&iommu->lock, flags);
 }
-/* page table handling */
-#define LEVEL_STRIDE		(9)
-#define LEVEL_MASK		(((u64)1 << LEVEL_STRIDE) - 1)
-static inline int agaw_to_level(int agaw)
-{
-	return agaw + 2;
-}
-static inline int agaw_to_width(int agaw)
-{
-	return 30 + agaw * LEVEL_STRIDE;
-}
-static inline int width_to_agaw(int width)
-{
-	return (width - 30) / LEVEL_STRIDE;
-}
-static inline unsigned int level_to_offset_bits(int level)
-{
-	return (level - 1) * LEVEL_STRIDE;
-}
-static inline int pfn_level_offset(unsigned long pfn, int level)
-{
-	return (pfn >> level_to_offset_bits(level)) & LEVEL_MASK;
-}
-static inline unsigned long level_mask(int level)
-{
-	return -1UL << level_to_offset_bits(level);
-}
-static inline unsigned long level_size(int level)
-{
-	return 1UL << level_to_offset_bits(level);
-}
-static inline unsigned long align_to_level(unsigned long pfn, int level)
-{
-	return (pfn + level_size(level) - 1) & level_mask(level);
-}
 static struct dma_pte *pfn_to_dma_pte(struct dmar_domain *domain,
 				      unsigned long pfn)
 {
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf);
+#define GGC 0x52
+#define GGC_MEMORY_SIZE_MASK	(0xf << 8)
+#define GGC_MEMORY_SIZE_NONE	(0x0 << 8)
+#define GGC_MEMORY_SIZE_1M	(0x1 << 8)
+#define GGC_MEMORY_SIZE_2M	(0x3 << 8)
+#define GGC_MEMORY_VT_ENABLED	(0x8 << 8)
+#define GGC_MEMORY_SIZE_2M_VT	(0x9 << 8)
+#define GGC_MEMORY_SIZE_3M_VT	(0xa << 8)
+#define GGC_MEMORY_SIZE_4M_VT	(0xb << 8)
+static void __devinit quirk_calpella_no_shadow_gtt(struct pci_dev *dev)
+{
+	unsigned short ggc;
+	if (pci_read_config_word(dev, GGC, &ggc))
+		return;
+	if (!(ggc & GGC_MEMORY_VT_ENABLED)) {
+		printk(KERN_INFO "DMAR: BIOS has allocated no shadow GTT; disabling IOMMU for graphics\n");
+		dmar_map_gfx = 0;
+	}
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0040, quirk_calpella_no_shadow_gtt);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0044, quirk_calpella_no_shadow_gtt);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0062, quirk_calpella_no_shadow_gtt);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x006a, quirk_calpella_no_shadow_gtt);
 /* On Tylersburg chipsets, some BIOSes have been known to enable the
    ISOCH DMAR unit for the Azalia sound device, but not give it any
    TLB entries, which causes it to deadlock. Check for that.  We do

drivers/pci/iov.c+1−1

@@ -608,7 +608,7 @@ int pci_iov_resource_bar(struct pci_dev *dev, int resno, · 607 unmodified lines
608	* the VF BAR size multiplied by the number of VFs. The alignment	608	* the VF BAR size multiplied by the number of VFs. The alignment
609	* is just the VF BAR size.	609	* is just the VF BAR size.
610	*/	610	*/
611	int pci_sriov_resource_alignment(struct pci_dev *dev, int resno)	611	resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno)
612	{	612	{
613	struct resource tmp;	613	struct resource tmp;
614	enum pci_bar_type type;	614	enum pci_bar_type type;

drivers/pci/pci.h+3−2

 extern void pci_iov_release(struct pci_dev *dev);
 extern int pci_iov_resource_bar(struct pci_dev *dev, int resno,
 				enum pci_bar_type *type);
-extern int pci_sriov_resource_alignment(struct pci_dev *dev, int resno);
+extern resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev,
+						    int resno);
 extern void pci_restore_iov_state(struct pci_dev *dev);
 extern int pci_iov_bus_range(struct pci_bus *bus);
 }
 #endif /* CONFIG_PCI_IOV */
-static inline int pci_resource_alignment(struct pci_dev *dev,
+static inline resource_size_t pci_resource_alignment(struct pci_dev *dev,
 					 struct resource *res)
 {
 #ifdef CONFIG_PCI_IOV

drivers/pci/quirks.c+20−0

@@ -162,6 +162,26 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_1, quirk_isa_d · 161 unmodified lines
162	DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_2, quirk_isa_dma_hangs);	162	DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_2, quirk_isa_dma_hangs);
163	DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_3, quirk_isa_dma_hangs);	163	DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_3, quirk_isa_dma_hangs);
164		164
		165	/*
		166	* Intel NM10 "TigerPoint" LPC PM1a_STS.BM_STS must be clear
		167	* for some HT machines to use C4 w/o hanging.
		168	*/
		169	static void __devinit quirk_tigerpoint_bm_sts(struct pci_dev *dev)
		170	{
		171	u32 pmbase;
		172	u16 pm1a;
		173
		174	pci_read_config_dword(dev, 0x40, &pmbase);
		175	pmbase = pmbase & 0xff80;
		176	pm1a = inw(pmbase);
		177
		178	if (pm1a & 0x10) {
		179	dev_info(&dev->dev, FW_BUG "TigerPoint LPC.BM_STS cleared\n");
		180	outw(0x10, pmbase);
		181	}
		182	}
		183	DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TGP_LPC, quirk_tigerpoint_bm_sts);
		184
165	/*	185	/*
166	* Chipsets where PCI->PCI transfers vanish or hang	186	* Chipsets where PCI->PCI transfers vanish or hang
167	*/	187	*/

drivers/pcmcia/pcmcia_resource.c+6−0

 	if (c->io[1].end) {
 		ret = alloc_io_space(s, &c->io[1], p_dev->io_lines);
 		if (ret) {
+			struct resource tmp = c->io[0];
+			/* release the previously allocated resource */
 			release_io_space(s, &c->io[0]);
+			/* but preserve the settings, for they worked... */
+			c->io[0].end = resource_size(&tmp);
+			c->io[0].start = tmp.start;
+			c->io[0].flags = tmp.flags;
 			goto out;
 		}
 	} else

drivers/pcmcia/pd6729.c+1−1

@@ -646,7 +646,7 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev, · 645 unmodified lines
646	if (!pci_resource_start(dev, 0)) {	646	if (!pci_resource_start(dev, 0)) {
647	dev_warn(&dev->dev, "refusing to load the driver as the "	647	dev_warn(&dev->dev, "refusing to load the driver as the "
648	"io_base is NULL.\n");	648	"io_base is NULL.\n");
649	goto err_out_free_mem;	649	goto err_out_disable;
650	}	650	}
651		651
652	dev_info(&dev->dev, "Cirrus PD6729 PCI to PCMCIA Bridge at 0x%llx "	652	dev_info(&dev->dev, "Cirrus PD6729 PCI to PCMCIA Bridge at 0x%llx "

drivers/platform/x86/thinkpad_acpi.c+3−2

 	TPACPI_Q_IBM('1', 'D', TPACPI_HK_Q_INIMASK), /* X22, X23, X24 */
 };
-typedef u16 tpacpi_keymap_t[TPACPI_HOTKEY_MAP_LEN];
+typedef u16 tpacpi_keymap_entry_t;
+typedef tpacpi_keymap_entry_t tpacpi_keymap_t[TPACPI_HOTKEY_MAP_LEN];
 static int __init hotkey_init(struct ibm_init_struct *iibm)
 {
 	};
 #define TPACPI_HOTKEY_MAP_SIZE		sizeof(tpacpi_keymap_t)
-#define TPACPI_HOTKEY_MAP_TYPESIZE	sizeof(tpacpi_keymap_t[0])
+#define TPACPI_HOTKEY_MAP_TYPESIZE	sizeof(tpacpi_keymap_entry_t)
 	int res, i;
 	int status;

drivers/regulator/core.c+4−2

 	    constraints->min_uA != constraints->max_uA) {
 		ret = _regulator_get_current_limit(rdev);
 		if (ret > 0)
-			count += sprintf(buf + count, "at %d uA ", ret / 1000);
+			count += sprintf(buf + count, "at %d mA ", ret / 1000);
 	}
 	if (constraints->valid_modes_mask & REGULATOR_MODE_FAST)
 	dev_set_name(&rdev->dev, "regulator.%d",
 		     atomic_inc_return(&regulator_no) - 1);
 	ret = device_register(&rdev->dev);
-	if (ret != 0)
+	if (ret != 0) {
+		put_device(&rdev->dev);
 		goto clean;
+	}
 	dev_set_drvdata(&rdev->dev, rdev);

drivers/regulator/max8649.c+1−1

@@ -330,7 +330,7 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client, · 329 unmodified lines
330	/* set external clock frequency */	330	/* set external clock frequency */
331	info->extclk_freq = pdata->extclk_freq;	331	info->extclk_freq = pdata->extclk_freq;
332	max8649_set_bits(info->i2c, MAX8649_SYNC, MAX8649_EXT_MASK,	332	max8649_set_bits(info->i2c, MAX8649_SYNC, MAX8649_EXT_MASK,
333	info->extclk_freq);	333	info->extclk_freq << 6);
334	}	334	}
335		335
336	if (pdata->ramp_timing) {	336	if (pdata->ramp_timing) {

drivers/rtc/rtc-ab3100.c+2−0

 		err = PTR_ERR(rtc);
 		return err;
 	}
+	platform_set_drvdata(pdev, rtc);
 	return 0;
 }
 	struct rtc_device *rtc = platform_get_drvdata(pdev);
 	rtc_device_unregister(rtc);
+	platform_set_drvdata(pdev, NULL);
 	return 0;
 }

drivers/rtc/rtc-s3c.c+8−5

 	s3c_rtc_setaie(alrm->enabled);
-	if (alrm->enabled)
-		enable_irq_wake(s3c_rtc_alarmno);
-	else
-		disable_irq_wake(s3c_rtc_alarmno);
 	return 0;
 }
 		ticnt_en_save &= S3C64XX_RTCCON_TICEN;
 	}
 	s3c_rtc_enable(pdev, 0);
+	if (device_may_wakeup(&pdev->dev))
+		enable_irq_wake(s3c_rtc_alarmno);
 	return 0;
 }
 		tmp = readb(s3c_rtc_base + S3C2410_RTCCON);
 		writeb(tmp | ticnt_en_save, s3c_rtc_base + S3C2410_RTCCON);
 	}
+	if (device_may_wakeup(&pdev->dev))
+		disable_irq_wake(s3c_rtc_alarmno);
 	return 0;
 }
 #else

drivers/s390/net/ctcm_main.c+2−2

@@ -1154,7 +1154,7 @@ static struct net_device ctcm_init_netdevice(struct ctcm_priv priv) · 1153 unmodified lines
1154	dev_fsm, dev_fsm_len, GFP_KERNEL);	1154	dev_fsm, dev_fsm_len, GFP_KERNEL);
1155	if (priv->fsm == NULL) {	1155	if (priv->fsm == NULL) {
1156	CTCMY_DBF_DEV(SETUP, dev, "init_fsm error");	1156	CTCMY_DBF_DEV(SETUP, dev, "init_fsm error");
1157	kfree(dev);	1157	free_netdev(dev);
1158	return NULL;	1158	return NULL;
1159	}	1159	}
1160	fsm_newstate(priv->fsm, DEV_STATE_STOPPED);	1160	fsm_newstate(priv->fsm, DEV_STATE_STOPPED);
@@ -1165,7 +1165,7 @@ static struct net_device ctcm_init_netdevice(struct ctcm_priv priv) · 4 unmodified lines
1165	grp = ctcmpc_init_mpc_group(priv);	1165	grp = ctcmpc_init_mpc_group(priv);
1166	if (grp == NULL) {	1166	if (grp == NULL) {
1167	MPC_DBF_DEV(SETUP, dev, "init_mpc_group error");	1167	MPC_DBF_DEV(SETUP, dev, "init_mpc_group error");
1168	kfree(dev);	1168	free_netdev(dev);
1169	return NULL;	1169	return NULL;
1170	}	1170	}
1171	tasklet_init(&grp->mpc_tasklet2,	1171	tasklet_init(&grp->mpc_tasklet2,

drivers/serial/mfd.c+1−0

@@ -27,6 +27,7 @@ · 26 unmodified lines
27	#include <linux/init.h>	27	#include <linux/init.h>
28	#include <linux/console.h>	28	#include <linux/console.h>
29	#include <linux/sysrq.h>	29	#include <linux/sysrq.h>
		30	#include <linux/slab.h>
30	#include <linux/serial_reg.h>	31	#include <linux/serial_reg.h>
31	#include <linux/circ_buf.h>	32	#include <linux/circ_buf.h>
32	#include <linux/delay.h>	33	#include <linux/delay.h>

drivers/serial/mrst_max3110.c+1−0

@@ -29,6 +29,7 @@ · 28 unmodified lines
29		29
30	#include <linux/module.h>	30	#include <linux/module.h>
31	#include <linux/ioport.h>	31	#include <linux/ioport.h>
		32	#include <linux/irq.h>
32	#include <linux/init.h>	33	#include <linux/init.h>
33	#include <linux/console.h>	34	#include <linux/console.h>
34	#include <linux/sysrq.h>	35	#include <linux/sysrq.h>

drivers/spi/spi.c+5−0

 #include <linux/init.h>
 #include <linux/cache.h>
 #include <linux/mutex.h>
+#include <linux/of_device.h>
 #include <linux/slab.h>
 #include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 	const struct spi_device	*spi = to_spi_device(dev);
 	const struct spi_driver	*sdrv = to_spi_driver(drv);
+	/* Attempt an OF style match */
+	if (of_driver_match_device(dev, drv))
+		return 1;
 	if (sdrv->id_table)
 		return !!spi_match_id(sdrv->id_table, spi);

drivers/spi/spi_gpio.c+1−1

@@ -350,7 +350,7 @@ static int __init spi_gpio_probe(struct platform_device *pdev) · 349 unmodified lines
350	spi_gpio->bitbang.master = spi_master_get(master);	350	spi_gpio->bitbang.master = spi_master_get(master);
351	spi_gpio->bitbang.chipselect = spi_gpio_chipselect;	351	spi_gpio->bitbang.chipselect = spi_gpio_chipselect;
352		352
353	if ((master_flags & (SPI_MASTER_NO_RX \| SPI_MASTER_NO_RX)) == 0) {	353	if ((master_flags & (SPI_MASTER_NO_TX \| SPI_MASTER_NO_RX)) == 0) {
354	spi_gpio->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_word_mode0;	354	spi_gpio->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_word_mode0;
355	spi_gpio->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_word_mode1;	355	spi_gpio->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_word_mode1;
356	spi_gpio->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_word_mode2;	356	spi_gpio->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_word_mode2;

drivers/spi/spi_mpc8xxx.c+8−2

 	xfer_ofs = mspi->xfer_in_progress->len - mspi->count;
-	out_be32(&rx_bd->cbd_bufaddr, mspi->rx_dma + xfer_ofs);
+	if (mspi->rx_dma == mspi->dma_dummy_rx)
+		out_be32(&rx_bd->cbd_bufaddr, mspi->rx_dma);
+	else
+		out_be32(&rx_bd->cbd_bufaddr, mspi->rx_dma + xfer_ofs);
 	out_be16(&rx_bd->cbd_datlen, 0);
 	out_be16(&rx_bd->cbd_sc, BD_SC_EMPTY | BD_SC_INTRPT | BD_SC_WRAP);
-	out_be32(&tx_bd->cbd_bufaddr, mspi->tx_dma + xfer_ofs);
+	if (mspi->tx_dma == mspi->dma_dummy_tx)
+		out_be32(&tx_bd->cbd_bufaddr, mspi->tx_dma);
+	else
+		out_be32(&tx_bd->cbd_bufaddr, mspi->tx_dma + xfer_ofs);
 	out_be16(&tx_bd->cbd_datlen, xfer_len);
 	out_be16(&tx_bd->cbd_sc, BD_SC_READY | BD_SC_INTRPT | BD_SC_WRAP |
 				 BD_SC_LAST);

drivers/staging/ti-st/st.h+0−1

@@ -80,5 +80,4 @@ struct st_proto_s { · 79 unmodified lines
80	extern long st_register(struct st_proto_s *);	80	extern long st_register(struct st_proto_s *);
81	extern long st_unregister(enum proto_type);	81	extern long st_unregister(enum proto_type);
82		82
83	extern struct platform_device *st_get_plat_device(void);
84	#endif /* ST_H */	83	#endif /* ST_H */

drivers/staging/ti-st/st_core.c+4−5

 #include "st_ll.h"
 #include "st.h"
-#define VERBOSE
 /* strings to be used for rfkill entries and by
  * ST Core to be used for sysfs debug entry
  */
 	long err = 0;
 	unsigned long flags = 0;
-	st_kim_ref(&st_gdata);
+	st_kim_ref(&st_gdata, 0);
 	pr_info("%s(%d) ", __func__, new_proto->type);
 	if (st_gdata == NULL || new_proto == NULL || new_proto->recv == NULL
 	    || new_proto->reg_complete_cb == NULL) {
 	pr_debug("%s: %d ", __func__, type);
-	st_kim_ref(&st_gdata);
+	st_kim_ref(&st_gdata, 0);
 	if (type < ST_BT || type >= ST_MAX) {
 		pr_err(" protocol %d not supported", type);
 		return -EPROTONOSUPPORT;
 #endif
 	long len;
-	st_kim_ref(&st_gdata);
+	st_kim_ref(&st_gdata, 0);
 	if (unlikely(skb == NULL || st_gdata == NULL
 		|| st_gdata->tty == NULL)) {
 		pr_err("data/tty unavailable to perform write");
 	struct st_data_s *st_gdata;
 	pr_info("%s ", __func__);
-	st_kim_ref(&st_gdata);
+	st_kim_ref(&st_gdata, 0);
 	st_gdata->tty = tty;
 	tty->disc_data = st_gdata;

drivers/staging/ti-st/st_core.h+1−1

@@ -117,7 +117,7 @@ int st_core_init(struct st_data_s **); · 116 unmodified lines
117	void st_core_exit(struct st_data_s *);	117	void st_core_exit(struct st_data_s *);
118		118
119	/* ask for reference from KIM */	119	/* ask for reference from KIM */
120	void st_kim_ref(struct st_data_s **);	120	void st_kim_ref(struct st_data_s **, int);
121		121
122	#define GPS_STUB_TEST	122	#define GPS_STUB_TEST
123	#ifdef GPS_STUB_TEST	123	#ifdef GPS_STUB_TEST

drivers/staging/ti-st/st_kim.c+19−3

 	PROTO_ENTRY(ST_GPS, "GPS"),
 };
+#define MAX_ST_DEVICES	3	/* Imagine 1 on each UART for now */
+struct platform_device *st_kim_devices[MAX_ST_DEVICES];
 /**********************************************************************/
 /* internal functions */
+/**
+ * st_get_plat_device -
+ *	function which returns the reference to the platform device
+ *	requested by id. As of now only 1 such device exists (id=0)
+ *	the context requesting for reference can get the id to be
+ *	requested by a. The protocol driver which is registering or
+ *	b. the tty device which is opened.
+ */
+static struct platform_device *st_get_plat_device(int id)
+{
+	return st_kim_devices[id];
+}
 /**
  * validate_firmware_response -
  *	function to return whether the firmware response was proper
 	struct kim_data_s	*kim_gdata;
 	pr_info(" %s ", __func__);
-	kim_pdev = st_get_plat_device();
+	kim_pdev = st_get_plat_device(0);
 	kim_gdata = dev_get_drvdata(&kim_pdev->dev);
 	if (kim_gdata->gpios[type] == -1) {
  *	This would enable multiple such platform devices to exist
  *	on a given platform
  */
-void st_kim_ref(struct st_data_s **core_data)
+void st_kim_ref(struct st_data_s **core_data, int id)
 {
 	struct platform_device	*pdev;
 	struct kim_data_s	*kim_gdata;
 	/* get kim_gdata reference from platform device */
-	pdev = st_get_plat_device();
+	pdev = st_get_plat_device(id);
 	kim_gdata = dev_get_drvdata(&pdev->dev);
 	*core_data = kim_gdata->core_data;
 }
 	long *gpios = pdev->dev.platform_data;
 	struct kim_data_s	*kim_gdata;
+	st_kim_devices[pdev->id] = pdev;
 	kim_gdata = kzalloc(sizeof(struct kim_data_s), GFP_ATOMIC);
 	if (!kim_gdata) {
 		pr_err("no mem to allocate");

drivers/usb/core/Kconfig+3−3

@@ -91,12 +91,12 @@ config USB_DYNAMIC_MINORS · 90 unmodified lines
91	If you are unsure about this, say N here.	91	If you are unsure about this, say N here.
92		92
93	config USB_SUSPEND	93	config USB_SUSPEND
94	bool "USB runtime power management (suspend/resume and wakeup)"	94	bool "USB runtime power management (autosuspend) and wakeup"
95	depends on USB && PM_RUNTIME	95	depends on USB && PM_RUNTIME
96	help	96	help
97	If you say Y here, you can use driver calls or the sysfs	97	If you say Y here, you can use driver calls or the sysfs
98	"power/level" file to suspend or resume individual USB	98	"power/control" file to enable or disable autosuspend for
99	peripherals and to enable or disable autosuspend (see	99	individual USB peripherals (see
100	Documentation/usb/power-management.txt for more details).	100	Documentation/usb/power-management.txt for more details).
101		101
102	Also, USB "remote wakeup" signaling is supported, whereby some	102	Also, USB "remote wakeup" signaling is supported, whereby some

drivers/usb/core/file.c+16−19

@@ -159,9 +159,9 @@ void usb_major_cleanup(void) · 158 unmodified lines
159	int usb_register_dev(struct usb_interface *intf,	159	int usb_register_dev(struct usb_interface *intf,
160	struct usb_class_driver *class_driver)	160	struct usb_class_driver *class_driver)
161	{	161	{
162	int retval = -EINVAL;	162	int retval;
163	int minor_base = class_driver->minor_base;	163	int minor_base = class_driver->minor_base;
164	int minor = 0;	164	int minor;
165	char name[20];	165	char name[20];
166	char *temp;	166	char *temp;
167		167
@@ -173,12 +173,17 @@ int usb_register_dev(struct usb_interface *intf, · 5 unmodified lines
173	*/	173	*/
174	minor_base = 0;	174	minor_base = 0;
175	#endif	175	#endif
176	intf->minor = -1;
177
178	dbg ("looking for a minor, starting at %d", minor_base);
179		176
180	if (class_driver->fops == NULL)	177	if (class_driver->fops == NULL)
181	goto exit;	178	return -EINVAL;
		179	if (intf->minor >= 0)
		180	return -EADDRINUSE;
		181
		182	retval = init_usb_class();
		183	if (retval)
		184	return retval;
		185
		186	dev_dbg(&intf->dev, "looking for a minor, starting at %d", minor_base);
182		187
183	down_write(&minor_rwsem);	188	down_write(&minor_rwsem);
184	for (minor = minor_base; minor < MAX_USB_MINORS; ++minor) {	189	for (minor = minor_base; minor < MAX_USB_MINORS; ++minor) {
@@ -186,20 +191,12 @@ int usb_register_dev(struct usb_interface *intf, · 1 unmodified line
186	continue;	191	continue;
187		192
188	usb_minors[minor] = class_driver->fops;	193	usb_minors[minor] = class_driver->fops;
189		194	intf->minor = minor;
190	retval = 0;
191	break;	195	break;
192	}	196	}
193	up_write(&minor_rwsem);	197	up_write(&minor_rwsem);
194		198	if (intf->minor < 0)
195	if (retval)	199	return -EXFULL;
196	goto exit;
197
198	retval = init_usb_class();
199	if (retval)
200	goto exit;
201
202	intf->minor = minor;
203		200
204	/* create a usb class device for this usb interface */	201	/* create a usb class device for this usb interface */
205	snprintf(name, sizeof(name), class_driver->name, minor - minor_base);	202	snprintf(name, sizeof(name), class_driver->name, minor - minor_base);
@@ -213,11 +210,11 @@ int usb_register_dev(struct usb_interface *intf, · 7 unmodified lines
213	"%s", temp);	210	"%s", temp);
214	if (IS_ERR(intf->usb_dev)) {	211	if (IS_ERR(intf->usb_dev)) {
215	down_write(&minor_rwsem);	212	down_write(&minor_rwsem);
216	usb_minors[intf->minor] = NULL;	213	usb_minors[minor] = NULL;
		214	intf->minor = -1;
217	up_write(&minor_rwsem);	215	up_write(&minor_rwsem);
218	retval = PTR_ERR(intf->usb_dev);	216	retval = PTR_ERR(intf->usb_dev);
219	}	217	}
220	exit:
221	return retval;	218	return retval;
222	}	219	}
223	EXPORT_SYMBOL_GPL(usb_register_dev);	220	EXPORT_SYMBOL_GPL(usb_register_dev);

drivers/usb/core/message.c+1−0

@@ -1802,6 +1802,7 @@ free_interfaces: · 1801 unmodified lines
1802	intf->dev.groups = usb_interface_groups;	1802	intf->dev.groups = usb_interface_groups;
1803	intf->dev.dma_mask = dev->dev.dma_mask;	1803	intf->dev.dma_mask = dev->dev.dma_mask;
1804	INIT_WORK(&intf->reset_ws, __usb_queue_reset_device);	1804	INIT_WORK(&intf->reset_ws, __usb_queue_reset_device);
		1805	intf->minor = -1;
1805	device_initialize(&intf->dev);	1806	device_initialize(&intf->dev);
1806	dev_set_name(&intf->dev, "%d-%s:%d.%d",	1807	dev_set_name(&intf->dev, "%d-%s:%d.%d",
1807	dev->bus->busnum, dev->devpath,	1808	dev->bus->busnum, dev->devpath,

drivers/usb/musb/cppi_dma.c+1−0

@@ -322,6 +322,7 @@ cppi_channel_allocate(struct dma_controller *c, · 321 unmodified lines
322	index, transmit ? 'T' : 'R', cppi_ch);	322	index, transmit ? 'T' : 'R', cppi_ch);
323	cppi_ch->hw_ep = ep;	323	cppi_ch->hw_ep = ep;
324	cppi_ch->channel.status = MUSB_DMA_STATUS_FREE;	324	cppi_ch->channel.status = MUSB_DMA_STATUS_FREE;
		325	cppi_ch->channel.max_len = 0x7fffffff;
325		326
326	DBG(4, "Allocate CPPI%d %cX\n", index, transmit ? 'T' : 'R');	327	DBG(4, "Allocate CPPI%d %cX\n", index, transmit ? 'T' : 'R');
327	return &cppi_ch->channel;	328	return &cppi_ch->channel;

drivers/usb/musb/musb_gadget.c+39−36

@@ -300,6 +300,11 @@ static void txstate(struct musb musb, struct musb_request req) · 299 unmodified lines
300	#ifndef CONFIG_MUSB_PIO_ONLY	300	#ifndef CONFIG_MUSB_PIO_ONLY
301	if (is_dma_capable() && musb_ep->dma) {	301	if (is_dma_capable() && musb_ep->dma) {
302	struct dma_controller *c = musb->dma_controller;	302	struct dma_controller *c = musb->dma_controller;
		303	size_t request_size;
		304
		305	/* setup DMA, then program endpoint CSR */
		306	request_size = min_t(size_t, request->length - request->actual,
		307	musb_ep->dma->max_len);
303		308
304	use_dma = (request->dma != DMA_ADDR_INVALID);	309	use_dma = (request->dma != DMA_ADDR_INVALID);
305		310
@@ -307,11 +312,6 @@ static void txstate(struct musb musb, struct musb_request req) · 1 unmodified line
307		312
308	#ifdef CONFIG_USB_INVENTRA_DMA	313	#ifdef CONFIG_USB_INVENTRA_DMA
309	{	314	{
310	size_t request_size;
311
312	/* setup DMA, then program endpoint CSR */
313	request_size = min_t(size_t, request->length,
314	musb_ep->dma->max_len);
315	if (request_size < musb_ep->packet_sz)	315	if (request_size < musb_ep->packet_sz)
316	musb_ep->dma->desired_mode = 0;	316	musb_ep->dma->desired_mode = 0;
317	else	317	else
@@ -373,8 +373,8 @@ static void txstate(struct musb musb, struct musb_request req) · 55 unmodified lines
373	use_dma = use_dma && c->channel_program(	373	use_dma = use_dma && c->channel_program(
374	musb_ep->dma, musb_ep->packet_sz,	374	musb_ep->dma, musb_ep->packet_sz,
375	0,	375	0,
376	request->dma,	376	request->dma + request->actual,
377	request->length);	377	request_size);
378	if (!use_dma) {	378	if (!use_dma) {
379	c->channel_release(musb_ep->dma);	379	c->channel_release(musb_ep->dma);
380	musb_ep->dma = NULL;	380	musb_ep->dma = NULL;
@@ -386,8 +386,8 @@ static void txstate(struct musb musb, struct musb_request req) · 5 unmodified lines
386	use_dma = use_dma && c->channel_program(	386	use_dma = use_dma && c->channel_program(
387	musb_ep->dma, musb_ep->packet_sz,	387	musb_ep->dma, musb_ep->packet_sz,
388	request->zero,	388	request->zero,
389	request->dma,	389	request->dma + request->actual,
390	request->length);	390	request_size);
391	#endif	391	#endif
392	}	392	}
393	#endif	393	#endif
@@ -501,26 +501,14 @@ void musb_g_tx(struct musb *musb, u8 epnum) · 107 unmodified lines
501	request->zero = 0;	501	request->zero = 0;
502	}	502	}
503		503
504	/* ... or if not, then complete it. */	504	if (request->actual == request->length) {
505	musb_g_giveback(musb_ep, request, 0);	505	musb_g_giveback(musb_ep, request, 0);
506		506	request = musb_ep->desc ? next_request(musb_ep) : NULL;
507	/*	507	if (!request) {
508	* Kickstart next transfer if appropriate;	508	DBG(4, "%s idle now\n",
509	* the packet that just completed might not	509	musb_ep->end_point.name);
510	* be transmitted for hours or days.	510	return;
511	* REVISIT for double buffering...	511	}
512	* FIXME revisit for stalls too...
513	*/
514	musb_ep_select(mbase, epnum);
515	csr = musb_readw(epio, MUSB_TXCSR);
516	if (csr & MUSB_TXCSR_FIFONOTEMPTY)
517	return;
518
519	request = musb_ep->desc ? next_request(musb_ep) : NULL;
520	if (!request) {
521	DBG(4, "%s idle now\n",
522	musb_ep->end_point.name);
523	return;
524	}	512	}
525	}	513	}
526		514
@@ -568,11 +556,19 @@ static void rxstate(struct musb musb, struct musb_request req) · 41 unmodified lines
568	{	556	{
569	const u8 epnum = req->epnum;	557	const u8 epnum = req->epnum;
570	struct usb_request *request = &req->request;	558	struct usb_request *request = &req->request;
571	struct musb_ep *musb_ep = &musb->endpoints[epnum].ep_out;	559	struct musb_ep *musb_ep;
572	void __iomem *epio = musb->endpoints[epnum].regs;	560	void __iomem *epio = musb->endpoints[epnum].regs;
573	unsigned fifo_count = 0;	561	unsigned fifo_count = 0;
574	u16 len = musb_ep->packet_sz;	562	u16 len;
575	u16 csr = musb_readw(epio, MUSB_RXCSR);	563	u16 csr = musb_readw(epio, MUSB_RXCSR);
		564	struct musb_hw_ep *hw_ep = &musb->endpoints[epnum];
		565
		566	if (hw_ep->is_shared_fifo)
		567	musb_ep = &hw_ep->ep_in;
		568	else
		569	musb_ep = &hw_ep->ep_out;
		570
		571	len = musb_ep->packet_sz;
576		572
577	/* We shouldn't get here while DMA is active, but we do... */	573	/* We shouldn't get here while DMA is active, but we do... */
578	if (dma_channel_status(musb_ep->dma) == MUSB_DMA_STATUS_BUSY) {	574	if (dma_channel_status(musb_ep->dma) == MUSB_DMA_STATUS_BUSY) {
@@ -647,8 +643,8 @@ static void rxstate(struct musb musb, struct musb_request req) · 68 unmodified lines
647	*/	643	*/
648		644
649	csr \|= MUSB_RXCSR_DMAENAB;	645	csr \|= MUSB_RXCSR_DMAENAB;
650	#ifdef USE_MODE1
651	csr \|= MUSB_RXCSR_AUTOCLEAR;	646	csr \|= MUSB_RXCSR_AUTOCLEAR;
		647	#ifdef USE_MODE1
652	/* csr \|= MUSB_RXCSR_DMAMODE; */	648	/* csr \|= MUSB_RXCSR_DMAMODE; */
653		649
654	/* this special sequence (enabling and then	650	/* this special sequence (enabling and then
@@ -663,10 +659,11 @@ static void rxstate(struct musb musb, struct musb_request req) · 8 unmodified lines
663	if (request->actual < request->length) {	659	if (request->actual < request->length) {
664	int transfer_size = 0;	660	int transfer_size = 0;
665	#ifdef USE_MODE1	661	#ifdef USE_MODE1
666	transfer_size = min(request->length,	662	transfer_size = min(request->length - request->actual,
667	channel->max_len);	663	channel->max_len);
668	#else	664	#else
669	transfer_size = len;	665	transfer_size = min(request->length - request->actual,
		666	(unsigned)len);
670	#endif	667	#endif
671	if (transfer_size <= musb_ep->packet_sz)	668	if (transfer_size <= musb_ep->packet_sz)
672	musb_ep->dma->desired_mode = 0;	669	musb_ep->dma->desired_mode = 0;
@@ -740,9 +737,15 @@ void musb_g_rx(struct musb *musb, u8 epnum) · 67 unmodified lines
740	u16 csr;	737	u16 csr;
741	struct usb_request *request;	738	struct usb_request *request;
742	void __iomem *mbase = musb->mregs;	739	void __iomem *mbase = musb->mregs;
743	struct musb_ep *musb_ep = &musb->endpoints[epnum].ep_out;	740	struct musb_ep *musb_ep;
744	void __iomem *epio = musb->endpoints[epnum].regs;	741	void __iomem *epio = musb->endpoints[epnum].regs;
745	struct dma_channel *dma;	742	struct dma_channel *dma;
		743	struct musb_hw_ep *hw_ep = &musb->endpoints[epnum];
		744
		745	if (hw_ep->is_shared_fifo)
		746	musb_ep = &hw_ep->ep_in;
		747	else
		748	musb_ep = &hw_ep->ep_out;
746		749
747	musb_ep_select(mbase, epnum);	750	musb_ep_select(mbase, epnum);
748		751
@@ -1081,7 +1084,7 @@ struct free_record { · 332 unmodified lines
1081	/*	1084	/*
1082	* Context: controller locked, IRQs blocked.	1085	* Context: controller locked, IRQs blocked.
1083	*/	1086	*/
1084	static void musb_ep_restart(struct musb musb, struct musb_request req)	1087	void musb_ep_restart(struct musb musb, struct musb_request req)
1085	{	1088	{
1086	DBG(3, "<== %s request %p len %u on hw_ep%d\n",	1089	DBG(3, "<== %s request %p len %u on hw_ep%d\n",
1087	req->tx ? "TX/IN" : "RX/OUT",	1090	req->tx ? "TX/IN" : "RX/OUT",

drivers/usb/musb/musb_gadget.h+2−0

@@ -105,4 +105,6 @@ extern void musb_gadget_cleanup(struct musb *); · 104 unmodified lines
105		105
106	extern void musb_g_giveback(struct musb_ep , struct usb_request , int);	106	extern void musb_g_giveback(struct musb_ep , struct usb_request , int);
107		107
		108	extern void musb_ep_restart(struct musb , struct musb_request );
		109
108	#endif /* __MUSB_GADGET_H */	110	#endif /* __MUSB_GADGET_H */

drivers/usb/musb/musb_gadget_ep0.c+9−0

 					ctrlrequest->wIndex & 0x0f;
 				struct musb_ep		*musb_ep;
 				struct musb_hw_ep	*ep;
+				struct musb_request	*request;
 				void __iomem		*regs;
 				int			is_in;
 				u16			csr;
 					musb_writew(regs, MUSB_RXCSR, csr);
 				}
+				/* Maybe start the first request in the queue */
+				request = to_musb_request(
+						next_request(musb_ep));
+				if (!musb_ep->busy && request) {
+					DBG(3, "restarting the request\n");
+					musb_ep_restart(musb, request);
+				}
 				/* select ep0 again */
 				musb_ep_select(mbase, 0);
 				} break;

drivers/usb/musb/musb_host.c+6−0

 	qh->segsize = length;
+	/*
+	 * Ensure the data reaches to main memory before starting
+	 * DMA transfer
+	 */
+	wmb();
 	if (!dma->channel_program(channel, pkt_size, mode,
 			urb->transfer_dma + offset, length)) {
 		dma->channel_release(channel);

drivers/vhost/net.c+1−1

@@ -243,7 +243,7 @@ static int get_rx_bufs(struct vhost_virtqueue *vq, · 242 unmodified lines
243	int r, nlogs = 0;	243	int r, nlogs = 0;
244		244
245	while (datalen > 0) {	245	while (datalen > 0) {
246	if (unlikely(headcount >= VHOST_NET_MAX_SG)) {	246	if (unlikely(seg >= VHOST_NET_MAX_SG)) {
247	r = -ENOBUFS;	247	r = -ENOBUFS;
248	goto err;	248	goto err;
249	}	249	}

drivers/vhost/vhost.c+4−3

 		if (r < 0)
 			return r;
 		len -= l;
-		if (!len)
+		if (!len) {
+			if (vq->log_ctx)
+				eventfd_signal(vq->log_ctx, 1);
 			return 0;
+		}
 	}
-	if (vq->log_ctx)
-		eventfd_signal(vq->log_ctx, 1);
 	/* Length written exceeds what we have stored. This is a bug. */
 	BUG();
 	return 0;

drivers/video/console/fbcon.c+3−2

 	softback_buf = 0UL;
 	for (i = 0; i < FB_MAX; i++) {
-		int pending;
+		int pending = 0;
 		mapped = 0;
 		info = registered_fb[i];
 		if (info == NULL)
 			continue;
-		pending = cancel_work_sync(&info->queue);
+		if (info->queue.func)
+			pending = cancel_work_sync(&info->queue);
 		DPRINTK("fbcon: %s pending work\n", (pending ? "canceled" :
 			"no"));

drivers/video/efifb.c+91−12

@@ -13,7 +13,7 @@ · 12 unmodified lines
13	#include <linux/platform_device.h>	13	#include <linux/platform_device.h>
14	#include <linux/screen_info.h>	14	#include <linux/screen_info.h>
15	#include <linux/dmi.h>	15	#include <linux/dmi.h>
16		16	#include <linux/pci.h>
17	#include <video/vga.h>	17	#include <video/vga.h>
18		18
19	static struct fb_var_screeninfo efifb_defined __devinitdata = {	19	static struct fb_var_screeninfo efifb_defined __devinitdata = {
@@ -39,17 +39,31 @@ enum { · 19 unmodified lines
39	M_I20, /* 20-Inch iMac */	39	M_I20, /* 20-Inch iMac */
40	M_I20_SR, /* 20-Inch iMac (Santa Rosa) */	40	M_I20_SR, /* 20-Inch iMac (Santa Rosa) */
41	M_I24, /* 24-Inch iMac */	41	M_I24, /* 24-Inch iMac */
		42	M_I24_8_1, /* 24-Inch iMac, 8,1th gen */
		43	M_I24_10_1, /* 24-Inch iMac, 10,1th gen */
		44	M_I27_11_1, /* 27-Inch iMac, 11,1th gen */
42	M_MINI, /* Mac Mini */	45	M_MINI, /* Mac Mini */
		46	M_MINI_3_1, /* Mac Mini, 3,1th gen */
		47	M_MINI_4_1, /* Mac Mini, 4,1th gen */
43	M_MB, /* MacBook */	48	M_MB, /* MacBook */
44	M_MB_2, /* MacBook, 2nd rev. */	49	M_MB_2, /* MacBook, 2nd rev. */
45	M_MB_3, /* MacBook, 3rd rev. */	50	M_MB_3, /* MacBook, 3rd rev. */
		51	M_MB_5_1, /* MacBook, 5th rev. */
		52	M_MB_6_1, /* MacBook, 6th rev. */
		53	M_MB_7_1, /* MacBook, 7th rev. */
46	M_MB_SR, /* MacBook, 2nd gen, (Santa Rosa) */	54	M_MB_SR, /* MacBook, 2nd gen, (Santa Rosa) */
47	M_MBA, /* MacBook Air */	55	M_MBA, /* MacBook Air */
48	M_MBP, /* MacBook Pro */	56	M_MBP, /* MacBook Pro */
49	M_MBP_2, /* MacBook Pro 2nd gen */	57	M_MBP_2, /* MacBook Pro 2nd gen */
		58	M_MBP_2_2, /* MacBook Pro 2,2nd gen */
50	M_MBP_SR, /* MacBook Pro (Santa Rosa) */	59	M_MBP_SR, /* MacBook Pro (Santa Rosa) */
51	M_MBP_4, /* MacBook Pro, 4th gen */	60	M_MBP_4, /* MacBook Pro, 4th gen */
52	M_MBP_5_1, /* MacBook Pro, 5,1th gen */	61	M_MBP_5_1, /* MacBook Pro, 5,1th gen */
		62	M_MBP_5_2, /* MacBook Pro, 5,2th gen */
		63	M_MBP_5_3, /* MacBook Pro, 5,3rd gen */
		64	M_MBP_6_1, /* MacBook Pro, 6,1th gen */
		65	M_MBP_6_2, /* MacBook Pro, 6,2th gen */
		66	M_MBP_7_1, /* MacBook Pro, 7,1th gen */
53	M_UNKNOWN /* placeholder */	67	M_UNKNOWN /* placeholder */
54	};	68	};
55		69
@@ -64,14 +78,28 @@ static struct efifb_dmi_info { · 8 unmodified lines
64	[M_I20] = { "i20", 0x80010000, 1728 * 4, 1680, 1050 }, /* guess */	78	[M_I20] = { "i20", 0x80010000, 1728 * 4, 1680, 1050 }, /* guess */
65	[M_I20_SR] = { "imac7", 0x40010000, 1728 * 4, 1680, 1050 },	79	[M_I20_SR] = { "imac7", 0x40010000, 1728 * 4, 1680, 1050 },
66	[M_I24] = { "i24", 0x80010000, 2048 * 4, 1920, 1200 }, /* guess */	80	[M_I24] = { "i24", 0x80010000, 2048 * 4, 1920, 1200 }, /* guess */
		81	[M_I24_8_1] = { "imac8", 0xc0060000, 2048 * 4, 1920, 1200 },
		82	[M_I24_10_1] = { "imac10", 0xc0010000, 2048 * 4, 1920, 1080 },
		83	[M_I27_11_1] = { "imac11", 0xc0010000, 2560 * 4, 2560, 1440 },
67	[M_MINI]= { "mini", 0x80000000, 2048 * 4, 1024, 768 },	84	[M_MINI]= { "mini", 0x80000000, 2048 * 4, 1024, 768 },
		85	[M_MINI_3_1] = { "mini31", 0x40010000, 1024 * 4, 1024, 768 },
		86	[M_MINI_4_1] = { "mini41", 0xc0010000, 2048 * 4, 1920, 1200 },
68	[M_MB] = { "macbook", 0x80000000, 2048 * 4, 1280, 800 },	87	[M_MB] = { "macbook", 0x80000000, 2048 * 4, 1280, 800 },
		88	[M_MB_5_1] = { "macbook51", 0x80010000, 2048 * 4, 1280, 800 },
		89	[M_MB_6_1] = { "macbook61", 0x80010000, 2048 * 4, 1280, 800 },
		90	[M_MB_7_1] = { "macbook71", 0x80010000, 2048 * 4, 1280, 800 },
69	[M_MBA] = { "mba", 0x80000000, 2048 * 4, 1280, 800 },	91	[M_MBA] = { "mba", 0x80000000, 2048 * 4, 1280, 800 },
70	[M_MBP] = { "mbp", 0x80010000, 1472 * 4, 1440, 900 },	92	[M_MBP] = { "mbp", 0x80010000, 1472 * 4, 1440, 900 },
71	[M_MBP_2] = { "mbp2", 0, 0, 0, 0 }, /* placeholder */	93	[M_MBP_2] = { "mbp2", 0, 0, 0, 0 }, /* placeholder */
		94	[M_MBP_2_2] = { "mbp22", 0x80010000, 1472 * 4, 1440, 900 },
72	[M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900 },	95	[M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900 },
73	[M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200 },	96	[M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200 },
74	[M_MBP_5_1] = { "mbp51", 0xc0010000, 2048 * 4, 1440, 900 },	97	[M_MBP_5_1] = { "mbp51", 0xc0010000, 2048 * 4, 1440, 900 },
		98	[M_MBP_5_2] = { "mbp52", 0xc0010000, 2048 * 4, 1920, 1200 },
		99	[M_MBP_5_3] = { "mbp53", 0xd0010000, 2048 * 4, 1440, 900 },
		100	[M_MBP_6_1] = { "mbp61", 0x90030000, 2048 * 4, 1920, 1200 },
		101	[M_MBP_6_2] = { "mbp62", 0x90030000, 2048 * 4, 1680, 1050 },
		102	[M_MBP_7_1] = { "mbp71", 0xc0010000, 2048 * 4, 1280, 800 },
75	[M_UNKNOWN] = { NULL, 0, 0, 0, 0 }	103	[M_UNKNOWN] = { NULL, 0, 0, 0, 0 }
76	};	104	};
77		105
@@ -92,7 +120,12 @@ static const struct dmi_system_id dmi_system_table[] __initconst = { · 14 unmodified lines
92	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac6,1", M_I24),	120	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac6,1", M_I24),
93	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac6,1", M_I24),	121	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac6,1", M_I24),
94	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac7,1", M_I20_SR),	122	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac7,1", M_I20_SR),
		123	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac8,1", M_I24_8_1),
		124	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac10,1", M_I24_10_1),
		125	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac11,1", M_I27_11_1),
95	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "Macmini1,1", M_MINI),	126	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "Macmini1,1", M_MINI),
		127	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "Macmini3,1", M_MINI_3_1),
		128	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "Macmini4,1", M_MINI_4_1),
96	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook1,1", M_MB),	129	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook1,1", M_MB),
97	/* At least one of these two will be right; maybe both? */	130	/* At least one of these two will be right; maybe both? */
98	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook2,1", M_MB),	131	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook2,1", M_MB),
@@ -101,14 +134,23 @@ static const struct dmi_system_id dmi_system_table[] __initconst = { · 2 unmodified lines
101	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook3,1", M_MB),	134	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook3,1", M_MB),
102	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook3,1", M_MB),	135	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook3,1", M_MB),
103	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook4,1", M_MB),	136	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook4,1", M_MB),
		137	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook5,1", M_MB_5_1),
		138	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook6,1", M_MB_6_1),
		139	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook7,1", M_MB_7_1),
104	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookAir1,1", M_MBA),	140	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookAir1,1", M_MBA),
105	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro1,1", M_MBP),	141	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro1,1", M_MBP),
106	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,1", M_MBP_2),	142	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,1", M_MBP_2),
		143	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,2", M_MBP_2_2),
107	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro2,1", M_MBP_2),	144	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro2,1", M_MBP_2),
108	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro3,1", M_MBP_SR),	145	EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro3,1", M_MBP_SR),
109	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro3,1", M_MBP_SR),	146	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro3,1", M_MBP_SR),
110	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro4,1", M_MBP_4),	147	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro4,1", M_MBP_4),
111	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro5,1", M_MBP_5_1),	148	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro5,1", M_MBP_5_1),
		149	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro5,2", M_MBP_5_2),
		150	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro5,3", M_MBP_5_3),
		151	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro6,1", M_MBP_6_1),
		152	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro6,2", M_MBP_6_2),
		153	EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro7,1", M_MBP_7_1),
112	{},	154	{},
113	};	155	};
114		156
@@ -116,7 +158,7 @@ static int set_system(const struct dmi_system_id *id) · 1 unmodified line
116	{	158	{
117	struct efifb_dmi_info *info = id->driver_data;	159	struct efifb_dmi_info *info = id->driver_data;
118	if (info->base == 0)	160	if (info->base == 0)
119	return -ENODEV;	161	return 0;
120		162
121	printk(KERN_INFO "efifb: dmi detected %s - framebuffer at %p "	163	printk(KERN_INFO "efifb: dmi detected %s - framebuffer at %p "
122	"(%dx%d, stride %d)\n", id->ident,	164	"(%dx%d, stride %d)\n", id->ident,
@@ -124,18 +166,55 @@ static int set_system(const struct dmi_system_id *id) · 1 unmodified line
124	info->stride);	166	info->stride);
125		167
126	/* Trust the bootloader over the DMI tables */	168	/* Trust the bootloader over the DMI tables */
127	if (screen_info.lfb_base == 0)	169	if (screen_info.lfb_base == 0) {
		170	#if defined(CONFIG_PCI)
		171	struct pci_dev *dev = NULL;
		172	int found_bar = 0;
		173	#endif
128	screen_info.lfb_base = info->base;	174	screen_info.lfb_base = info->base;
129	if (screen_info.lfb_linelength == 0)
130	screen_info.lfb_linelength = info->stride;
131	if (screen_info.lfb_width == 0)
132	screen_info.lfb_width = info->width;
133	if (screen_info.lfb_height == 0)
134	screen_info.lfb_height = info->height;
135	if (screen_info.orig_video_isVGA == 0)
136	screen_info.orig_video_isVGA = VIDEO_TYPE_EFI;
137		175
138	return 0;	176	#if defined(CONFIG_PCI)
		177	/* make sure that the address in the table is actually on a
		178	* VGA device's PCI BAR */
		179
		180	for_each_pci_dev(dev) {
		181	int i;
		182	if ((dev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
		183	continue;
		184	for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
		185	resource_size_t start, end;
		186
		187	start = pci_resource_start(dev, i);
		188	if (start == 0)
		189	break;
		190	end = pci_resource_end(dev, i);
		191	if (screen_info.lfb_base >= start &&
		192	screen_info.lfb_base < end) {
		193	found_bar = 1;
		194	}
		195	}
		196	}
		197	if (!found_bar)
		198	screen_info.lfb_base = 0;
		199	#endif
		200	}
		201	if (screen_info.lfb_base) {
		202	if (screen_info.lfb_linelength == 0)
		203	screen_info.lfb_linelength = info->stride;
		204	if (screen_info.lfb_width == 0)
		205	screen_info.lfb_width = info->width;
		206	if (screen_info.lfb_height == 0)
		207	screen_info.lfb_height = info->height;
		208	if (screen_info.orig_video_isVGA == 0)
		209	screen_info.orig_video_isVGA = VIDEO_TYPE_EFI;
		210	} else {
		211	screen_info.lfb_linelength = 0;
		212	screen_info.lfb_width = 0;
		213	screen_info.lfb_height = 0;
		214	screen_info.orig_video_isVGA = 0;
		215	return 0;
		216	}
		217	return 1;
139	}	218	}
140		219
141	static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,	220	static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green,

drivers/video/pxa168fb.c+2−2

@@ -298,8 +298,8 @@ static void set_dma_control0(struct pxa168fb_info *fbi) · 297 unmodified lines
298	* Set bit to enable graphics DMA.	298	* Set bit to enable graphics DMA.
299	*/	299	*/
300	x = readl(fbi->reg_base + LCD_SPU_DMA_CTRL0);	300	x = readl(fbi->reg_base + LCD_SPU_DMA_CTRL0);
301	x \|= fbi->active ? 0x00000100 : 0;	301	x &= ~CFG_GRA_ENA_MASK;
302	fbi->active = 0;	302	x \|= fbi->active ? CFG_GRA_ENA(1) : CFG_GRA_ENA(0);
303		303
304	/*	304	/*
305	* If we are in a pseudo-color mode, we need to enable	305	* If we are in a pseudo-color mode, we need to enable

drivers/video/sis/sis_main.c+3−0

@@ -1701,6 +1701,9 @@ static int sisfb_ioctl(struct fb_info *info, unsigned int cmd, · 1700 unmodified lines
1701	break;	1701	break;
1702		1702
1703	case FBIOGET_VBLANK:	1703	case FBIOGET_VBLANK:
		1704
		1705	memset(&sisvbblank, 0, sizeof(struct fb_vblank));
		1706
1704	sisvbblank.count = 0;	1707	sisvbblank.count = 0;
1705	sisvbblank.flags = sisfb_setupvbblankflags(ivideo, &sisvbblank.vcount, &sisvbblank.hcount);	1708	sisvbblank.flags = sisfb_setupvbblankflags(ivideo, &sisvbblank.vcount, &sisvbblank.hcount);
1706		1709

drivers/xen/xenbus/xenbus_probe.c+6−3

 {
 	int ret = 0;
-	blocking_notifier_chain_register(&xenstore_chain, nb);
+	if (xenstored_ready > 0)
+		ret = nb->notifier_call(nb, 0, NULL);
+	else
+		blocking_notifier_chain_register(&xenstore_chain, nb);
 	return ret;
 }
 void xenbus_probe(struct work_struct *unused)
 {
-	BUG_ON((xenstored_ready <= 0));
+	xenstored_ready = 1;
 	/* Enumerate devices in xenstore and watch for changes. */
 	xenbus_probe_devices(&xenbus_frontend);
 			xen_store_evtchn = xen_start_info->store_evtchn;
 			xen_store_mfn = xen_start_info->store_mfn;
 			xen_store_interface = mfn_to_virt(xen_store_mfn);
+			xenstored_ready = 1;
 		}
-		xenstored_ready = 1;
 	}
 	/* Initialize the interface to xenstore. */

fs/aio.c+9−1

 	 */
 	ret = retry(iocb);
-	if (ret != -EIOCBRETRY && ret != -EIOCBQUEUED)
+	if (ret != -EIOCBRETRY && ret != -EIOCBQUEUED) {
+		/*
+		 * There's no easy way to restart the syscall since other AIO's
+		 * may be already running. Just fail this IO with EINTR.
+		 */
+		if (unlikely(ret == -ERESTARTSYS || ret == -ERESTARTNOINTR ||
+			     ret == -ERESTARTNOHAND || ret == -ERESTART_RESTARTBLOCK))
+			ret = -EINTR;
 		aio_complete(iocb, ret, 0);
+	}
 out:
 	spin_lock_irq(&ctx->ctx_lock);

fs/cifs/cifssmb.c+33−16

 small_smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
 		void **request_buf)
 {
-	int rc = 0;
+	int rc;
 	rc = cifs_reconnect_tcon(tcon, smb_command);
 	if (rc)
 	if (tcon != NULL)
 		cifs_stats_inc(&tcon->num_smbs_sent);
-	return rc;
+	return 0;
 }
 int
 /* If the return code is zero, this function must fill in request_buf pointer */
 static int
-smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
+__smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
-	 void **request_buf /* returned */ ,
+			void **request_buf, void **response_buf)
-	 void **response_buf /* returned */ )
 {
-	int rc = 0;
-	rc = cifs_reconnect_tcon(tcon, smb_command);
-	if (rc)
-		return rc;
 	*request_buf = cifs_buf_get();
 	if (*request_buf == NULL) {
 		/* BB should we add a retry in here if not a writepage? */
 	if (tcon != NULL)
 		cifs_stats_inc(&tcon->num_smbs_sent);
-	return rc;
+	return 0;
+}
+/* If the return code is zero, this function must fill in request_buf pointer */
+static int
+smb_init(int smb_command, int wct, struct cifsTconInfo *tcon,
+	 void **request_buf, void **response_buf)
+{
+	int rc;
+	rc = cifs_reconnect_tcon(tcon, smb_command);
+	if (rc)
+		return rc;
+	return __smb_init(smb_command, wct, tcon, request_buf, response_buf);
+}
+static int
+smb_init_no_reconnect(int smb_command, int wct, struct cifsTconInfo *tcon,
+			void **request_buf, void **response_buf)
+{
+	if (tcon->ses->need_reconnect || tcon->need_reconnect)
+		return -EHOSTDOWN;
+	return __smb_init(smb_command, wct, tcon, request_buf, response_buf);
 }
 static int validate_t2(struct smb_t2_rsp *pSMB)
 	cFYI(1, "In QFSUnixInfo");
 QFSUnixRetry:
-	rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB,
+	rc = smb_init_no_reconnect(SMB_COM_TRANSACTION2, 15, tcon,
-		      (void **) &pSMBr);
+				   (void **) &pSMB, (void **) &pSMBr);
 	if (rc)
 		return rc;
 	cFYI(1, "In SETFSUnixInfo");
 SETFSUnixRetry:
 	/* BB switch to small buf init to save memory */
-	rc = smb_init(SMB_COM_TRANSACTION2, 15, tcon, (void **) &pSMB,
+	rc = smb_init_no_reconnect(SMB_COM_TRANSACTION2, 15, tcon,
-		      (void **) &pSMBr);
+					(void **) &pSMB, (void **) &pSMBr);
 	if (rc)
 		return rc;

fs/cifs/inode.c+2−0

 			inode->i_flags |= S_NOATIME | S_NOCMTIME;
 		if (inode->i_state & I_NEW) {
 			inode->i_ino = hash;
+			if (S_ISREG(inode->i_mode))
+				inode->i_data.backing_dev_info = sb->s_bdi;
 #ifdef CONFIG_CIFS_FSCACHE
 			/* initialize per-inode cache cookie pointer */
 			CIFS_I(inode)->fscache = NULL;

fs/compat.c+1−1

@@ -1153,7 +1153,7 @@ static ssize_t compat_do_readv_writev(int type, struct file *file, · 1152 unmodified lines
1153	{	1153	{
1154	compat_ssize_t tot_len;	1154	compat_ssize_t tot_len;
1155	struct iovec iovstack[UIO_FASTIOV];	1155	struct iovec iovstack[UIO_FASTIOV];
1156	struct iovec *iov;	1156	struct iovec *iov = iovstack;
1157	ssize_t ret;	1157	ssize_t ret;
1158	io_fn_t fn;	1158	io_fn_t fn;
1159	iov_fn_t fnv;	1159	iov_fn_t fnv;

fs/fs-writeback.c+4−15

@@ -72,22 +72,11 @@ int writeback_in_progress(struct backing_dev_info *bdi) · 71 unmodified lines
72	static inline struct backing_dev_info inode_to_bdi(struct inode inode)	72	static inline struct backing_dev_info inode_to_bdi(struct inode inode)
73	{	73	{
74	struct super_block *sb = inode->i_sb;	74	struct super_block *sb = inode->i_sb;
75	struct backing_dev_info *bdi = inode->i_mapping->backing_dev_info;
76		75
77	/*	76	if (strcmp(sb->s_type->name, "bdev") == 0)
78	* For inodes on standard filesystems, we use superblock's bdi. For	77	return inode->i_mapping->backing_dev_info;
79	* inodes on virtual filesystems, we want to use inode mapping's bdi	78
80	* because they can possibly point to something useful (think about	79	return sb->s_bdi;
81	* block_dev filesystem).
82	*/
83	if (sb->s_bdi && sb->s_bdi != &noop_backing_dev_info) {
84	/* Some device inodes could play dirty tricks. Catch them... */
85	WARN(bdi != sb->s_bdi && bdi_cap_writeback_dirty(bdi),
86	"Dirtiable inode bdi %s != sb bdi %s\n",
87	bdi->name, sb->s_bdi->name);
88	return sb->s_bdi;
89	}
90	return bdi;
91	}	80	}
92		81
93	static void bdi_queue_work(struct backing_dev_info *bdi,	82	static void bdi_queue_work(struct backing_dev_info *bdi,

fs/fuse/dev.c+1−1

@@ -1354,7 +1354,7 @@ static int fuse_retrieve(struct fuse_conn fc, struct inode inode, · 1353 unmodified lines
1354	loff_t file_size;	1354	loff_t file_size;
1355	unsigned int num;	1355	unsigned int num;
1356	unsigned int offset;	1356	unsigned int offset;
1357	size_t total_len;	1357	size_t total_len = 0;
1358		1358
1359	req = fuse_get_req(fc);	1359	req = fuse_get_req(fc);
1360	if (IS_ERR(req))	1360	if (IS_ERR(req))

fs/ocfs2/acl.c+3−0

@@ -209,7 +209,10 @@ static int ocfs2_acl_set_mode(struct inode inode, struct buffer_head di_bh, · 208 unmodified lines
209	}	209	}
210		210
211	inode->i_mode = new_mode;	211	inode->i_mode = new_mode;
		212	inode->i_ctime = CURRENT_TIME;
212	di->i_mode = cpu_to_le16(inode->i_mode);	213	di->i_mode = cpu_to_le16(inode->i_mode);
		214	di->i_ctime = cpu_to_le64(inode->i_ctime.tv_sec);
		215	di->i_ctime_nsec = cpu_to_le32(inode->i_ctime.tv_nsec);
213		216
214	ocfs2_journal_dirty(handle, di_bh);	217	ocfs2_journal_dirty(handle, di_bh);
215		218

fs/ocfs2/cluster/tcp.c+1−1

@@ -977,7 +977,7 @@ static int o2net_tx_can_proceed(struct o2net_node *nn, · 976 unmodified lines
977	int o2net_send_message_vec(u32 msg_type, u32 key, struct kvec *caller_vec,	977	int o2net_send_message_vec(u32 msg_type, u32 key, struct kvec *caller_vec,
978	size_t caller_veclen, u8 target_node, int *status)	978	size_t caller_veclen, u8 target_node, int *status)
979	{	979	{
980	int ret;	980	int ret = 0;
981	struct o2net_msg *msg = NULL;	981	struct o2net_msg *msg = NULL;
982	size_t veclen, caller_bytes = 0;	982	size_t veclen, caller_bytes = 0;
983	struct kvec *vec = NULL;	983	struct kvec *vec = NULL;

fs/ocfs2/dir.c+16−8

 		goto out_commit;
 	}
+	cpos = split_hash;
+	ret = ocfs2_dx_dir_new_cluster(dir, &et, cpos, handle,
+				       data_ac, meta_ac, new_dx_leaves,
+				       num_dx_leaves);
+	if (ret) {
+		mlog_errno(ret);
+		goto out_commit;
+	}
 	for (i = 0; i < num_dx_leaves; i++) {
 		ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir),
 					      orig_dx_leaves[i],
 			mlog_errno(ret);
 			goto out_commit;
 		}
-	}
-	cpos = split_hash;
+		ret = ocfs2_journal_access_dl(handle, INODE_CACHE(dir),
-	ret = ocfs2_dx_dir_new_cluster(dir, &et, cpos, handle,
+					      new_dx_leaves[i],
-				       data_ac, meta_ac, new_dx_leaves,
+					      OCFS2_JOURNAL_ACCESS_WRITE);
-				       num_dx_leaves);
+		if (ret) {
-	if (ret) {
+			mlog_errno(ret);
-		mlog_errno(ret);
+			goto out_commit;
-		goto out_commit;
+		}
 	}
 	ocfs2_dx_dir_transfer_leaf(dir, split_hash, handle, tmp_dx_leaf,

fs/ocfs2/dlm/dlmcommon.h+1−0

@@ -1030,6 +1030,7 @@ int dlm_drop_lockres_ref(struct dlm_ctxt *dlm, · 1029 unmodified lines
1030	struct dlm_lock_resource *res);	1030	struct dlm_lock_resource *res);
1031	void dlm_clean_master_list(struct dlm_ctxt *dlm,	1031	void dlm_clean_master_list(struct dlm_ctxt *dlm,
1032	u8 dead_node);	1032	u8 dead_node);
		1033	void dlm_force_free_mles(struct dlm_ctxt *dlm);
1033	int dlm_lock_basts_flushed(struct dlm_ctxt dlm, struct dlm_lock lock);	1034	int dlm_lock_basts_flushed(struct dlm_ctxt dlm, struct dlm_lock lock);
1034	int __dlm_lockres_has_locks(struct dlm_lock_resource *res);	1035	int __dlm_lockres_has_locks(struct dlm_lock_resource *res);
1035	int __dlm_lockres_unused(struct dlm_lock_resource *res);	1036	int __dlm_lockres_unused(struct dlm_lock_resource *res);

fs/ocfs2/dlm/dlmdebug.c+8−1

 	spin_lock(&dlm->track_lock);
 	if (oldres)
 		track_list = &oldres->tracking;
-	else
+	else {
 		track_list = &dlm->tracking_list;
+		if (list_empty(track_list)) {
+			dl = NULL;
+			spin_unlock(&dlm->track_lock);
+			goto bail;
+		}
+	}
 	list_for_each_entry(res, track_list, tracking) {
 		if (&res->tracking == &dlm->tracking_list)
 	} else
 		dl = NULL;
+bail:
 	/* passed to seq_show */
 	return dl;
 }

fs/ocfs2/dlm/dlmdomain.c+1−0

@@ -693,6 +693,7 @@ void dlm_unregister_domain(struct dlm_ctxt *dlm) · 692 unmodified lines
693		693
694	dlm_mark_domain_leaving(dlm);	694	dlm_mark_domain_leaving(dlm);
695	dlm_leave_domain(dlm);	695	dlm_leave_domain(dlm);
		696	dlm_force_free_mles(dlm);
696	dlm_complete_dlm_shutdown(dlm);	697	dlm_complete_dlm_shutdown(dlm);
697	}	698	}
698	dlm_put(dlm);	699	dlm_put(dlm);

fs/ocfs2/dlm/dlmmaster.c+40−0

@@ -3433,3 +3433,43 @@ void dlm_lockres_release_ast(struct dlm_ctxt *dlm, · 3432 unmodified lines
3433	wake_up(&res->wq);	3433	wake_up(&res->wq);
3434	wake_up(&dlm->migration_wq);	3434	wake_up(&dlm->migration_wq);
3435	}	3435	}
		3436
		3437	void dlm_force_free_mles(struct dlm_ctxt *dlm)
		3438	{
		3439	int i;
		3440	struct hlist_head *bucket;
		3441	struct dlm_master_list_entry *mle;
		3442	struct hlist_node tmp, list;
		3443
		3444	/*
		3445	* We notified all other nodes that we are exiting the domain and
		3446	* marked the dlm state to DLM_CTXT_LEAVING. If any mles are still
		3447	* around we force free them and wake any processes that are waiting
		3448	* on the mles
		3449	*/
		3450	spin_lock(&dlm->spinlock);
		3451	spin_lock(&dlm->master_lock);
		3452
		3453	BUG_ON(dlm->dlm_state != DLM_CTXT_LEAVING);
		3454	BUG_ON((find_next_bit(dlm->domain_map, O2NM_MAX_NODES, 0) < O2NM_MAX_NODES));
		3455
		3456	for (i = 0; i < DLM_HASH_BUCKETS; i++) {
		3457	bucket = dlm_master_hash(dlm, i);
		3458	hlist_for_each_safe(list, tmp, bucket) {
		3459	mle = hlist_entry(list, struct dlm_master_list_entry,
		3460	master_hash_node);
		3461	if (mle->type != DLM_MLE_BLOCK) {
		3462	mlog(ML_ERROR, "bad mle: %p\n", mle);
		3463	dlm_print_one_mle(mle);
		3464	}
		3465	atomic_set(&mle->woken, 1);
		3466	wake_up(&mle->wq);
		3467
		3468	__dlm_unlink_mle(dlm, mle);
		3469	__dlm_mle_detach_hb_events(dlm, mle);
		3470	__dlm_put_mle(mle);
		3471	}
		3472	}
		3473	spin_unlock(&dlm->master_lock);
		3474	spin_unlock(&dlm->spinlock);
		3475	}

fs/ocfs2/dlmglue.h+1−0

@@ -84,6 +84,7 @@ enum { · 83 unmodified lines
84	OI_LS_PARENT,	84	OI_LS_PARENT,
85	OI_LS_RENAME1,	85	OI_LS_RENAME1,
86	OI_LS_RENAME2,	86	OI_LS_RENAME2,
		87	OI_LS_REFLINK_TARGET,
87	};	88	};
88		89
89	int ocfs2_dlm_init(struct ocfs2_super *osb);	90	int ocfs2_dlm_init(struct ocfs2_super *osb);

fs/ocfs2/ocfs2_fs.h+25−12

@@ -235,18 +235,31 @@ · 234 unmodified lines
235	#define OCFS2_HAS_REFCOUNT_FL (0x0010)	235	#define OCFS2_HAS_REFCOUNT_FL (0x0010)
236		236
237	/* Inode attributes, keep in sync with EXT2 */	237	/* Inode attributes, keep in sync with EXT2 */
238	#define OCFS2_SECRM_FL (0x00000001) /* Secure deletion */	238	#define OCFS2_SECRM_FL FS_SECRM_FL /* Secure deletion */
239	#define OCFS2_UNRM_FL (0x00000002) /* Undelete */	239	#define OCFS2_UNRM_FL FS_UNRM_FL /* Undelete */
240	#define OCFS2_COMPR_FL (0x00000004) /* Compress file */	240	#define OCFS2_COMPR_FL FS_COMPR_FL /* Compress file */
241	#define OCFS2_SYNC_FL (0x00000008) /* Synchronous updates */	241	#define OCFS2_SYNC_FL FS_SYNC_FL /* Synchronous updates */
242	#define OCFS2_IMMUTABLE_FL (0x00000010) /* Immutable file */	242	#define OCFS2_IMMUTABLE_FL FS_IMMUTABLE_FL /* Immutable file */
243	#define OCFS2_APPEND_FL (0x00000020) /* writes to file may only append */	243	#define OCFS2_APPEND_FL FS_APPEND_FL /* writes to file may only append */
244	#define OCFS2_NODUMP_FL (0x00000040) /* do not dump file */	244	#define OCFS2_NODUMP_FL FS_NODUMP_FL /* do not dump file */
245	#define OCFS2_NOATIME_FL (0x00000080) /* do not update atime */	245	#define OCFS2_NOATIME_FL FS_NOATIME_FL /* do not update atime */
246	#define OCFS2_DIRSYNC_FL (0x00010000) /* dirsync behaviour (directories only) */	246	/* Reserved for compression usage... */
247		247	#define OCFS2_DIRTY_FL FS_DIRTY_FL
248	#define OCFS2_FL_VISIBLE (0x000100FF) /* User visible flags */	248	#define OCFS2_COMPRBLK_FL FS_COMPRBLK_FL /* One or more compressed clusters */
249	#define OCFS2_FL_MODIFIABLE (0x000100FF) /* User modifiable flags */	249	#define OCFS2_NOCOMP_FL FS_NOCOMP_FL /* Don't compress */
		250	#define OCFS2_ECOMPR_FL FS_ECOMPR_FL /* Compression error */
		251	/* End compression flags --- maybe not all used */
		252	#define OCFS2_BTREE_FL FS_BTREE_FL /* btree format dir */
		253	#define OCFS2_INDEX_FL FS_INDEX_FL /* hash-indexed directory */
		254	#define OCFS2_IMAGIC_FL FS_IMAGIC_FL /* AFS directory */
		255	#define OCFS2_JOURNAL_DATA_FL FS_JOURNAL_DATA_FL /* Reserved for ext3 */
		256	#define OCFS2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
		257	#define OCFS2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
		258	#define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
		259	#define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
		260
		261	#define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
		262	#define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
250		263
251	/*	264	/*
252	* Extent record flags (e_node.leaf.flags)	265	* Extent record flags (e_node.leaf.flags)

fs/ocfs2/ocfs2_ioctl.h+4−4

@@ -23,10 +23,10 @@ · 22 unmodified lines
23	/*	23	/*
24	* ioctl commands	24	* ioctl commands
25	*/	25	*/
26	#define OCFS2_IOC_GETFLAGS _IOR('f', 1, long)	26	#define OCFS2_IOC_GETFLAGS FS_IOC_GETFLAGS
27	#define OCFS2_IOC_SETFLAGS _IOW('f', 2, long)	27	#define OCFS2_IOC_SETFLAGS FS_IOC_SETFLAGS
28	#define OCFS2_IOC32_GETFLAGS _IOR('f', 1, int)	28	#define OCFS2_IOC32_GETFLAGS FS_IOC32_GETFLAGS
29	#define OCFS2_IOC32_SETFLAGS _IOW('f', 2, int)	29	#define OCFS2_IOC32_SETFLAGS FS_IOC32_SETFLAGS
30		30
31	/*	31	/*
32	* Space reservation / allocation / free ioctls and argument structure	32	* Space reservation / allocation / free ioctls and argument structure

fs/ocfs2/refcounttree.c+3−2

 		goto out;
 	}
-	mutex_lock(&new_inode->i_mutex);
+	mutex_lock_nested(&new_inode->i_mutex, I_MUTEX_CHILD);
-	ret = ocfs2_inode_lock(new_inode, &new_bh, 1);
+	ret = ocfs2_inode_lock_nested(new_inode, &new_bh, 1,
+				      OI_LS_REFLINK_TARGET);
 	if (ret) {
 		mlog_errno(ret);
 		goto out_unlock;

fs/ocfs2/reservations.c+10−12

 			   struct ocfs2_alloc_reservation *resv,
 			   int *cstart, int *clen)
 {
-	unsigned int wanted = *clen;
 	if (resv == NULL || ocfs2_resmap_disabled(resmap))
 		return -ENOSPC;
 	spin_lock(&resv_lock);
-	/*
-	 * We don't want to over-allocate for temporary
-	 * windows. Otherwise, we run the risk of fragmenting the
-	 * allocation space.
-	 */
-	wanted = ocfs2_resv_window_bits(resmap, resv);
-	if ((resv->r_flags & OCFS2_RESV_FLAG_TMP) || wanted < *clen)
-		wanted = *clen;
 	if (ocfs2_resv_empty(resv)) {
-		mlog(0, "empty reservation, find new window\n");
+		/*
+		 * We don't want to over-allocate for temporary
+		 * windows. Otherwise, we run the risk of fragmenting the
+		 * allocation space.
+		 */
+		unsigned int wanted = ocfs2_resv_window_bits(resmap, resv);
+		if ((resv->r_flags & OCFS2_RESV_FLAG_TMP) || wanted < *clen)
+			wanted = *clen;
+		mlog(0, "empty reservation, find new window\n");
 		/*
 		 * Try to get a window here. If it works, we must fall
 		 * through and test the bitmap . This avoids some

fs/ocfs2/suballoc.c+2−2

@@ -357,7 +357,7 @@ out: · 356 unmodified lines
357	static void ocfs2_bg_discontig_add_extent(struct ocfs2_super *osb,	357	static void ocfs2_bg_discontig_add_extent(struct ocfs2_super *osb,
358	struct ocfs2_group_desc *bg,	358	struct ocfs2_group_desc *bg,
359	struct ocfs2_chain_list *cl,	359	struct ocfs2_chain_list *cl,
360	u64 p_blkno, u32 clusters)	360	u64 p_blkno, unsigned int clusters)
361	{	361	{
362	struct ocfs2_extent_list *el = &bg->bg_list;	362	struct ocfs2_extent_list *el = &bg->bg_list;
363	struct ocfs2_extent_rec *rec;	363	struct ocfs2_extent_rec *rec;
@@ -369,7 +369,7 @@ static void ocfs2_bg_discontig_add_extent(struct ocfs2_super *osb, · 5 unmodified lines
369	rec->e_blkno = cpu_to_le64(p_blkno);	369	rec->e_blkno = cpu_to_le64(p_blkno);
370	rec->e_cpos = cpu_to_le32(le16_to_cpu(bg->bg_bits) /	370	rec->e_cpos = cpu_to_le32(le16_to_cpu(bg->bg_bits) /
371	le16_to_cpu(cl->cl_bpc));	371	le16_to_cpu(cl->cl_bpc));
372	rec->e_leaf_clusters = cpu_to_le32(clusters);	372	rec->e_leaf_clusters = cpu_to_le16(clusters);
373	le16_add_cpu(&bg->bg_bits, clusters * le16_to_cpu(cl->cl_bpc));	373	le16_add_cpu(&bg->bg_bits, clusters * le16_to_cpu(cl->cl_bpc));
374	le16_add_cpu(&bg->bg_free_bits_count,	374	le16_add_cpu(&bg->bg_free_bits_count,
375	clusters * le16_to_cpu(cl->cl_bpc));	375	clusters * le16_to_cpu(cl->cl_bpc));

fs/ocfs2/symlink.c+1−1

@@ -128,7 +128,7 @@ static void ocfs2_fast_follow_link(struct dentry dentry, · 127 unmodified lines
128	}	128	}
129		129
130	/* Fast symlinks can't be large */	130	/* Fast symlinks can't be large */
131	len = strlen(target);	131	len = strnlen(target, ocfs2_fast_symlink_chars(inode->i_sb));
132	link = kzalloc(len + 1, GFP_NOFS);	132	link = kzalloc(len + 1, GFP_NOFS);
133	if (!link) {	133	if (!link) {
134	status = -ENOMEM;	134	status = -ENOMEM;

fs/ocfs2/xattr.c+2−2

 	xis.inode_bh = xbs.inode_bh = di_bh;
 	di = (struct ocfs2_dinode *)di_bh->b_data;
-	down_read(&oi->ip_xattr_sem);
 	ret = ocfs2_xattr_ibody_get(inode, name_index, name, buffer,
 				    buffer_size, &xis);
 	if (ret == -ENODATA && di->i_xattr_loc)
 		ret = ocfs2_xattr_block_get(inode, name_index, name, buffer,
 					    buffer_size, &xbs);
-	up_read(&oi->ip_xattr_sem);
 	return ret;
 }
 		mlog_errno(ret);
 		return ret;
 	}
+	down_read(&OCFS2_I(inode)->ip_xattr_sem);
 	ret = ocfs2_xattr_get_nolock(inode, di_bh, name_index,
 				     name, buffer, buffer_size);
+	up_read(&OCFS2_I(inode)->ip_xattr_sem);
 	ocfs2_inode_unlock(inode, 0);

fs/proc/base.c+2−2

@@ -2675,7 +2675,7 @@ static const struct pid_entry tgid_base_stuff[] = { · 2674 unmodified lines
2675	INF("auxv", S_IRUSR, proc_pid_auxv),	2675	INF("auxv", S_IRUSR, proc_pid_auxv),
2676	ONE("status", S_IRUGO, proc_pid_status),	2676	ONE("status", S_IRUGO, proc_pid_status),
2677	ONE("personality", S_IRUSR, proc_pid_personality),	2677	ONE("personality", S_IRUSR, proc_pid_personality),
2678	INF("limits", S_IRUSR, proc_pid_limits),	2678	INF("limits", S_IRUGO, proc_pid_limits),
2679	#ifdef CONFIG_SCHED_DEBUG	2679	#ifdef CONFIG_SCHED_DEBUG
2680	REG("sched", S_IRUGO\|S_IWUSR, proc_pid_sched_operations),	2680	REG("sched", S_IRUGO\|S_IWUSR, proc_pid_sched_operations),
2681	#endif	2681	#endif
@@ -3011,7 +3011,7 @@ static const struct pid_entry tid_base_stuff[] = { · 329 unmodified lines
3011	INF("auxv", S_IRUSR, proc_pid_auxv),	3011	INF("auxv", S_IRUSR, proc_pid_auxv),
3012	ONE("status", S_IRUGO, proc_pid_status),	3012	ONE("status", S_IRUGO, proc_pid_status),
3013	ONE("personality", S_IRUSR, proc_pid_personality),	3013	ONE("personality", S_IRUSR, proc_pid_personality),
3014	INF("limits", S_IRUSR, proc_pid_limits),	3014	INF("limits", S_IRUGO, proc_pid_limits),
3015	#ifdef CONFIG_SCHED_DEBUG	3015	#ifdef CONFIG_SCHED_DEBUG
3016	REG("sched", S_IRUGO\|S_IWUSR, proc_pid_sched_operations),	3016	REG("sched", S_IRUGO\|S_IWUSR, proc_pid_sched_operations),
3017	#endif	3017	#endif

fs/proc/task_mmu.c+2−2

@@ -363,13 +363,13 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, · 362 unmodified lines
363	mss->referenced += PAGE_SIZE;	363	mss->referenced += PAGE_SIZE;
364	mapcount = page_mapcount(page);	364	mapcount = page_mapcount(page);
365	if (mapcount >= 2) {	365	if (mapcount >= 2) {
366	if (pte_dirty(ptent))	366	if (pte_dirty(ptent) \|\| PageDirty(page))
367	mss->shared_dirty += PAGE_SIZE;	367	mss->shared_dirty += PAGE_SIZE;
368	else	368	else
369	mss->shared_clean += PAGE_SIZE;	369	mss->shared_clean += PAGE_SIZE;
370	mss->pss += (PAGE_SIZE << PSS_SHIFT) / mapcount;	370	mss->pss += (PAGE_SIZE << PSS_SHIFT) / mapcount;
371	} else {	371	} else {
372	if (pte_dirty(ptent))	372	if (pte_dirty(ptent) \|\| PageDirty(page))
373	mss->private_dirty += PAGE_SIZE;	373	mss->private_dirty += PAGE_SIZE;
374	else	374	else
375	mss->private_clean += PAGE_SIZE;	375	mss->private_clean += PAGE_SIZE;

fs/proc/vmcore.c+1−1

@@ -163,7 +163,7 @@ static ssize_t read_vmcore(struct file file, char __user buffer, · 162 unmodified lines
163		163
164	static const struct file_operations proc_vmcore_operations = {	164	static const struct file_operations proc_vmcore_operations = {
165	.read = read_vmcore,	165	.read = read_vmcore,
166	.llseek = generic_file_llseek,	166	.llseek = default_llseek,
167	};	167	};
168		168
169	static struct vmcore* __init get_new_element(void)	169	static struct vmcore* __init get_new_element(void)

fs/reiserfs/ioctl.c+4−3

 int reiserfs_unpack(struct inode *inode, struct file *filp)
 {
 	int retval = 0;
+	int depth;
 	int index;
 	struct page *page;
 	struct address_space *mapping;
 	/* we need to make sure nobody is changing the file size beneath
 	 ** us
 	 */
-	mutex_lock(&inode->i_mutex);
+	reiserfs_mutex_lock_safe(&inode->i_mutex, inode->i_sb);
-	reiserfs_write_lock(inode->i_sb);
+	depth = reiserfs_write_lock_once(inode->i_sb);
 	write_from = inode->i_size & (blocksize - 1);
 	/* if we are on a block boundary, we are already unpacked.  */
       out:
 	mutex_unlock(&inode->i_mutex);
-	reiserfs_write_unlock(inode->i_sb);
+	reiserfs_write_unlock_once(inode->i_sb, depth);
 	return retval;
 }

fs/xfs/xfs_log_cil.c+9−3

 	new_ctx = kmem_zalloc(sizeof(*new_ctx), KM_SLEEP|KM_NOFS);
 	new_ctx->ticket = xlog_cil_ticket_alloc(log);
-	/* lock out transaction commit, but don't block on background push */
+	/*
+	 * Lock out transaction commit, but don't block for background pushes
+	 * unless we are well over the CIL space limit. See the definition of
+	 * XLOG_CIL_HARD_SPACE_LIMIT() for the full explanation of the logic
+	 * used here.
+	 */
 	if (!down_write_trylock(&cil->xc_ctx_lock)) {
-		if (!push_seq)
+		if (!push_seq &&
+		    cil->xc_ctx->space_used < XLOG_CIL_HARD_SPACE_LIMIT(log))
 			goto out_free_ticket;
 		down_write(&cil->xc_ctx_lock);
 	}
 		goto out_skip;
 	/* check for a previously pushed seqeunce */
-	if (push_seq < cil->xc_ctx->sequence)
+	if (push_seq && push_seq < cil->xc_ctx->sequence)
 		goto out_skip;
 	/*

fs/xfs/xfs_log_priv.h+21−16

@@ -426,13 +426,13 @@ struct xfs_cil { · 425 unmodified lines
426	};	426	};
427		427
428	/*	428	/*
429	* The amount of log space we should the CIL to aggregate is difficult to size.	429	* The amount of log space we allow the CIL to aggregate is difficult to size.
430	* Whatever we chose we have to make we can get a reservation for the log space	430	* Whatever we choose, we have to make sure we can get a reservation for the
431	* effectively, that it is large enough to capture sufficient relogging to	431	* log space effectively, that it is large enough to capture sufficient
432	* reduce log buffer IO significantly, but it is not too large for the log or	432	* relogging to reduce log buffer IO significantly, but it is not too large for
433	* induces too much latency when writing out through the iclogs. We track both	433	* the log or induces too much latency when writing out through the iclogs. We
434	* space consumed and the number of vectors in the checkpoint context, so we	434	* track both space consumed and the number of vectors in the checkpoint
435	* need to decide which to use for limiting.	435	* context, so we need to decide which to use for limiting.
436	*	436	*
437	* Every log buffer we write out during a push needs a header reserved, which	437	* Every log buffer we write out during a push needs a header reserved, which
438	* is at least one sector and more for v2 logs. Hence we need a reservation of	438	* is at least one sector and more for v2 logs. Hence we need a reservation of
@@ -459,16 +459,21 @@ struct xfs_cil { · 20 unmodified lines
459	* checkpoint transaction ticket is specific to the checkpoint context, rather	459	* checkpoint transaction ticket is specific to the checkpoint context, rather
460	* than the CIL itself.	460	* than the CIL itself.
461	*	461	*
462	* With dynamic reservations, we can basically make up arbitrary limits for the	462	* With dynamic reservations, we can effectively make up arbitrary limits for
463	* checkpoint size so long as they don't violate any other size rules. Hence	463	* the checkpoint size so long as they don't violate any other size rules.
464	* the initial maximum size for the checkpoint transaction will be set to a	464	* Recovery imposes a rule that no transaction exceed half the log, so we are
465	* quarter of the log or 8MB, which ever is smaller. 8MB is an arbitrary limit	465	* limited by that. Furthermore, the log transaction reservation subsystem
466	* right now based on the latency of writing out a large amount of data through	466	* tries to keep 25% of the log free, so we need to keep below that limit or we
467	* the circular iclog buffers.	467	* risk running out of free log space to start any new transactions.
		468	*
		469	* In order to keep background CIL push efficient, we will set a lower
		470	* threshold at which background pushing is attempted without blocking current
		471	* transaction commits. A separate, higher bound defines when CIL pushes are
		472	* enforced to ensure we stay within our maximum checkpoint size bounds.
		473	* threshold, yet give us plenty of space for aggregation on large logs.
468	*/	474	*/
469		475	#define XLOG_CIL_SPACE_LIMIT(log) (log->l_logsize >> 3)
470	#define XLOG_CIL_SPACE_LIMIT(log) \	476	#define XLOG_CIL_HARD_SPACE_LIMIT(log) (3 * (log->l_logsize >> 4))
471	(min((log->l_logsize >> 2), (8 * 1024 * 1024)))
472		477
473	/*	478	/*
474	* The reservation head lsn is not made up of a cycle number and block number.	479	* The reservation head lsn is not made up of a cycle number and block number.

include/acpi/acpixf.h+1−1

@@ -55,7 +55,7 @@ · 54 unmodified lines
55	extern u8 acpi_gbl_permanent_mmap;	55	extern u8 acpi_gbl_permanent_mmap;
56		56
57	/*	57	/*
58	* Globals that are publically available, allowing for	58	* Globals that are publicly available, allowing for
59	* run time configuration	59	* run time configuration
60	*/	60	*/
61	extern u32 acpi_dbg_level;	61	extern u32 acpi_dbg_level;

include/drm/drmP.h+20−9

@@ -612,7 +612,7 @@ struct drm_gem_object { · 611 unmodified lines
612	struct kref refcount;	612	struct kref refcount;
613		613
614	/** Handle count of this object. Each handle also holds a reference */	614	/** Handle count of this object. Each handle also holds a reference */
615	struct kref handlecount;	615	atomic_t handle_count; /* number of handles on this object */
616		616
617	/** Related drm device */	617	/** Related drm device */
618	struct drm_device *dev;	618	struct drm_device *dev;
@@ -808,7 +808,6 @@ struct drm_driver { · 189 unmodified lines
808	*/	808	*/
809	int (gem_init_object) (struct drm_gem_object obj);	809	int (gem_init_object) (struct drm_gem_object obj);
810	void (gem_free_object) (struct drm_gem_object obj);	810	void (gem_free_object) (struct drm_gem_object obj);
811	void (gem_free_object_unlocked) (struct drm_gem_object obj);
812		811
813	/* vga arb irq handler */	812	/* vga arb irq handler */
814	void (vgaarb_irq)(struct drm_device dev, bool state);	813	void (vgaarb_irq)(struct drm_device dev, bool state);
@@ -1175,6 +1174,7 @@ extern int drm_release(struct inode inode, struct file filp); · 360 unmodified lines
1175	extern int drm_mmap(struct file filp, struct vm_area_struct vma);	1174	extern int drm_mmap(struct file filp, struct vm_area_struct vma);
1176	extern int drm_mmap_locked(struct file filp, struct vm_area_struct vma);	1175	extern int drm_mmap_locked(struct file filp, struct vm_area_struct vma);
1177	extern void drm_vm_open_locked(struct vm_area_struct *vma);	1176	extern void drm_vm_open_locked(struct vm_area_struct *vma);
		1177	extern void drm_vm_close_locked(struct vm_area_struct *vma);
1178	extern resource_size_t drm_core_get_map_ofs(struct drm_local_map * map);	1178	extern resource_size_t drm_core_get_map_ofs(struct drm_local_map * map);
1179	extern resource_size_t drm_core_get_reg_ofs(struct drm_device *dev);	1179	extern resource_size_t drm_core_get_reg_ofs(struct drm_device *dev);
1180	extern unsigned int drm_poll(struct file filp, struct poll_table_struct wait);	1180	extern unsigned int drm_poll(struct file filp, struct poll_table_struct wait);
@@ -1455,12 +1455,11 @@ int drm_gem_init(struct drm_device *dev); · 274 unmodified lines
1455	void drm_gem_destroy(struct drm_device *dev);	1455	void drm_gem_destroy(struct drm_device *dev);
1456	void drm_gem_object_release(struct drm_gem_object *obj);	1456	void drm_gem_object_release(struct drm_gem_object *obj);
1457	void drm_gem_object_free(struct kref *kref);	1457	void drm_gem_object_free(struct kref *kref);
1458	void drm_gem_object_free_unlocked(struct kref *kref);
1459	struct drm_gem_object drm_gem_object_alloc(struct drm_device dev,	1458	struct drm_gem_object drm_gem_object_alloc(struct drm_device dev,
1460	size_t size);	1459	size_t size);
1461	int drm_gem_object_init(struct drm_device *dev,	1460	int drm_gem_object_init(struct drm_device *dev,
1462	struct drm_gem_object *obj, size_t size);	1461	struct drm_gem_object *obj, size_t size);
1463	void drm_gem_object_handle_free(struct kref *kref);	1462	void drm_gem_object_handle_free(struct drm_gem_object *obj);
1464	void drm_gem_vm_open(struct vm_area_struct *vma);	1463	void drm_gem_vm_open(struct vm_area_struct *vma);
1465	void drm_gem_vm_close(struct vm_area_struct *vma);	1464	void drm_gem_vm_close(struct vm_area_struct *vma);
1466	int drm_gem_mmap(struct file filp, struct vm_area_struct vma);	1465	int drm_gem_mmap(struct file filp, struct vm_area_struct vma);
@@ -1483,8 +1482,12 @@ drm_gem_object_unreference(struct drm_gem_object *obj) · 16 unmodified lines
1483	static inline void	1482	static inline void
1484	drm_gem_object_unreference_unlocked(struct drm_gem_object *obj)	1483	drm_gem_object_unreference_unlocked(struct drm_gem_object *obj)
1485	{	1484	{
1486	if (obj != NULL)	1485	if (obj != NULL) {
1487	kref_put(&obj->refcount, drm_gem_object_free_unlocked);	1486	struct drm_device *dev = obj->dev;
		1487	mutex_lock(&dev->struct_mutex);
		1488	kref_put(&obj->refcount, drm_gem_object_free);
		1489	mutex_unlock(&dev->struct_mutex);
		1490	}
1488	}	1491	}
1489		1492
1490	int drm_gem_handle_create(struct drm_file *file_priv,	1493	int drm_gem_handle_create(struct drm_file *file_priv,
@@ -1495,7 +1498,7 @@ static inline void · 4 unmodified lines
1495	drm_gem_object_handle_reference(struct drm_gem_object *obj)	1498	drm_gem_object_handle_reference(struct drm_gem_object *obj)
1496	{	1499	{
1497	drm_gem_object_reference(obj);	1500	drm_gem_object_reference(obj);
1498	kref_get(&obj->handlecount);	1501	atomic_inc(&obj->handle_count);
1499	}	1502	}
1500		1503
1501	static inline void	1504	static inline void
@@ -1504,12 +1507,15 @@ drm_gem_object_handle_unreference(struct drm_gem_object *obj) · 2 unmodified lines
1504	if (obj == NULL)	1507	if (obj == NULL)
1505	return;	1508	return;
1506		1509
		1510	if (atomic_read(&obj->handle_count) == 0)
		1511	return;
1507	/*	1512	/*
1508	* Must bump handle count first as this may be the last	1513	* Must bump handle count first as this may be the last
1509	* ref, in which case the object would disappear before we	1514	* ref, in which case the object would disappear before we
1510	* checked for a name	1515	* checked for a name
1511	*/	1516	*/
1512	kref_put(&obj->handlecount, drm_gem_object_handle_free);	1517	if (atomic_dec_and_test(&obj->handle_count))
		1518	drm_gem_object_handle_free(obj);
1513	drm_gem_object_unreference(obj);	1519	drm_gem_object_unreference(obj);
1514	}	1520	}
1515		1521
@@ -1519,12 +1525,17 @@ drm_gem_object_handle_unreference_unlocked(struct drm_gem_object *obj) · 3 unmodified lines
1519	if (obj == NULL)	1525	if (obj == NULL)
1520	return;	1526	return;
1521		1527
		1528	if (atomic_read(&obj->handle_count) == 0)
		1529	return;
		1530
1522	/*	1531	/*
1523	* Must bump handle count first as this may be the last	1532	* Must bump handle count first as this may be the last
1524	* ref, in which case the object would disappear before we	1533	* ref, in which case the object would disappear before we
1525	* checked for a name	1534	* checked for a name
1526	*/	1535	*/
1527	kref_put(&obj->handlecount, drm_gem_object_handle_free);	1536
		1537	if (atomic_dec_and_test(&obj->handle_count))
		1538	drm_gem_object_handle_free(obj);
1528	drm_gem_object_unreference_unlocked(obj);	1539	drm_gem_object_unreference_unlocked(obj);
1529	}	1540	}
1530		1541

include/drm/drm_pciids.h+1−1

 	{0x1002, 0x5460, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \
 	{0x1002, 0x5462, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \
 	{0x1002, 0x5464, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \
-	{0x1002, 0x5657, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x5548, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R423|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x5549, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R423|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x554A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R423|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x564F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x5652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x5653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x5657, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x5834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP}, \
 	{0x1002, 0x5835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY}, \
 	{0x1002, 0x5954, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \

include/linux/cpuidle.h+1−0

@@ -53,6 +53,7 @@ struct cpuidle_state { · 52 unmodified lines
53	#define CPUIDLE_FLAG_BALANCED (0x40) /* medium latency, moderate savings */	53	#define CPUIDLE_FLAG_BALANCED (0x40) /* medium latency, moderate savings */
54	#define CPUIDLE_FLAG_DEEP (0x80) /* high latency, large savings */	54	#define CPUIDLE_FLAG_DEEP (0x80) /* high latency, large savings */
55	#define CPUIDLE_FLAG_IGNORE (0x100) /* ignore during this idle period */	55	#define CPUIDLE_FLAG_IGNORE (0x100) /* ignore during this idle period */
		56	#define CPUIDLE_FLAG_TLB_FLUSHED (0x200) /* tlb will be flushed */
56		57
57	#define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000)	58	#define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000)
58		59

include/linux/dma-mapping.h+4−0

 	return DMA_BIT_MASK(32);
 }
+#ifdef ARCH_HAS_DMA_SET_COHERENT_MASK
+int dma_set_coherent_mask(struct device *dev, u64 mask);
+#else
 static inline int dma_set_coherent_mask(struct device *dev, u64 mask)
 {
 	if (!dma_supported(dev, mask))
 	dev->coherent_dma_mask = mask;
 	return 0;
 }
+#endif
 extern u64 dma_get_required_mask(struct device *dev);

include/linux/dmaengine.h+1−1

@@ -548,7 +548,7 @@ static inline bool dma_dev_has_pq_continue(struct dma_device *dma) · 547 unmodified lines
548	return (dma->max_pq & DMA_HAS_PQ_CONTINUE) == DMA_HAS_PQ_CONTINUE;	548	return (dma->max_pq & DMA_HAS_PQ_CONTINUE) == DMA_HAS_PQ_CONTINUE;
549	}	549	}
550		550
551	static unsigned short dma_dev_to_maxpq(struct dma_device *dma)	551	static inline unsigned short dma_dev_to_maxpq(struct dma_device *dma)
552	{	552	{
553	return dma->max_pq & ~DMA_HAS_PQ_CONTINUE;	553	return dma->max_pq & ~DMA_HAS_PQ_CONTINUE;
554	}	554	}

include/linux/module.h+2−3

 #ifdef CONFIG_GENERIC_BUG
-int  module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *,
+void module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *,
 			 struct module *);
 void module_bug_cleanup(struct module *);
 #else	/* !CONFIG_GENERIC_BUG */
-static inline int  module_bug_finalize(const Elf_Ehdr *hdr,
+static inline void module_bug_finalize(const Elf_Ehdr *hdr,
 					const Elf_Shdr *sechdrs,
 					struct module *mod)
 {
-	return 0;
 }
 static inline void module_bug_cleanup(struct module *mod) {}
 #endif	/* CONFIG_GENERIC_BUG */

include/linux/netlink.h+2−2

 #define MAX_LINKS 32
-struct net;
 struct sockaddr_nl {
 	sa_family_t	nl_family;	/* AF_NETLINK	*/
 	unsigned short	nl_pad;		/* zero		*/
 #include <linux/capability.h>
 #include <linux/skbuff.h>
+struct net;
 static inline struct nlmsghdr *nlmsg_hdr(const struct sk_buff *skb)
 {
 	return (struct nlmsghdr *)skb->data;

include/linux/pci_ids.h+3−0

@@ -393,6 +393,9 @@ · 392 unmodified lines
393	#define PCI_DEVICE_ID_VLSI_82C147 0x0105	393	#define PCI_DEVICE_ID_VLSI_82C147 0x0105
394	#define PCI_DEVICE_ID_VLSI_VAS96011 0x0702	394	#define PCI_DEVICE_ID_VLSI_VAS96011 0x0702
395		395
		396	/* AMD RD890 Chipset */
		397	#define PCI_DEVICE_ID_RD890_IOMMU 0x5a23
		398
396	#define PCI_VENDOR_ID_ADL 0x1005	399	#define PCI_VENDOR_ID_ADL 0x1005
397	#define PCI_DEVICE_ID_ADL_2301 0x2301	400	#define PCI_DEVICE_ID_ADL_2301 0x2301
398		401

include/linux/rcupdate.h+1−1

@@ -454,7 +454,7 @@ static inline notrace void rcu_read_unlock_sched_notrace(void) · 453 unmodified lines
454	* Makes rcu_dereference_check() do the dirty work.	454	* Makes rcu_dereference_check() do the dirty work.
455	*/	455	*/
456	#define rcu_dereference_bh(p) \	456	#define rcu_dereference_bh(p) \
457	rcu_dereference_check(p, rcu_read_lock_bh_held())	457	rcu_dereference_check(p, rcu_read_lock_bh_held() \|\| irqs_disabled())
458		458
459	/**	459	/**
460	* rcu_dereference_sched - fetch RCU-protected pointer, checking for RCU-sched	460	* rcu_dereference_sched - fetch RCU-protected pointer, checking for RCU-sched

include/linux/socket.h+1−1

@@ -322,7 +322,7 @@ extern int csum_partial_copy_fromiovecend(unsigned char *kdata, · 321 unmodified lines
322	int offset,	322	int offset,
323	unsigned int len, __wsum *csump);	323	unsigned int len, __wsum *csump);
324		324
325	extern int verify_iovec(struct msghdr m, struct iovec iov, struct sockaddr *address, int mode);	325	extern long verify_iovec(struct msghdr m, struct iovec iov, struct sockaddr *address, int mode);
326	extern int memcpy_toiovec(struct iovec v, unsigned char kdata, int len);	326	extern int memcpy_toiovec(struct iovec v, unsigned char kdata, int len);
327	extern int memcpy_toiovecend(const struct iovec v, unsigned char kdata,	327	extern int memcpy_toiovecend(const struct iovec v, unsigned char kdata,
328	int offset, int len);	328	int offset, int len);

include/linux/wait.h+1−0

@@ -614,6 +614,7 @@ int wake_bit_function(wait_queue_t wait, unsigned mode, int sync, void key); · 613 unmodified lines
614	(wait)->private = current; \	614	(wait)->private = current; \
615	(wait)->func = autoremove_wake_function; \	615	(wait)->func = autoremove_wake_function; \
616	INIT_LIST_HEAD(&(wait)->task_list); \	616	INIT_LIST_HEAD(&(wait)->task_list); \
		617	(wait)->flags = 0; \
617	} while (0)	618	} while (0)
618		619
619	/**	620	/**

include/net/addrconf.h+1−0

@@ -121,6 +121,7 @@ static inline int addrconf_finite_timeout(unsigned long timeout) · 120 unmodified lines
121	* IPv6 Address Label subsystem (addrlabel.c)	121	* IPv6 Address Label subsystem (addrlabel.c)
122	*/	122	*/
123	extern int ipv6_addr_label_init(void);	123	extern int ipv6_addr_label_init(void);
		124	extern void ipv6_addr_label_cleanup(void);
124	extern void ipv6_addr_label_rtnl_register(void);	125	extern void ipv6_addr_label_rtnl_register(void);
125	extern u32 ipv6_addr_label(struct net *net,	126	extern u32 ipv6_addr_label(struct net *net,
126	const struct in6_addr *addr,	127	const struct in6_addr *addr,

include/net/dst.h+1−0

@@ -242,6 +242,7 @@ static inline void skb_tunnel_rx(struct sk_buff skb, struct net_device dev) · 241 unmodified lines
242	dev->stats.rx_packets++;	242	dev->stats.rx_packets++;
243	dev->stats.rx_bytes += skb->len;	243	dev->stats.rx_bytes += skb->len;
244	skb->rxhash = 0;	244	skb->rxhash = 0;
		245	skb_set_queue_mapping(skb, 0);
245	skb_dst_drop(skb);	246	skb_dst_drop(skb);
246	nf_reset(skb);	247	nf_reset(skb);
247	}	248	}

include/net/route.h+2−0

 		fl.fl_ip_sport = sport;
 		fl.fl_ip_dport = dport;
 		fl.proto = protocol;
+		if (inet_sk(sk)->transparent)
+			fl.flags |= FLOWI_FLAG_ANYSRC;
 		ip_rt_put(*rp);
 		*rp = NULL;
 		security_sk_classify_flow(sk, &fl);

include/net/xfrm.h+2−2

@@ -298,8 +298,8 @@ struct xfrm_state_afinfo { · 297 unmodified lines
298	const struct xfrm_type *type_map[IPPROTO_MAX];	298	const struct xfrm_type *type_map[IPPROTO_MAX];
299	struct xfrm_mode *mode_map[XFRM_MODE_MAX];	299	struct xfrm_mode *mode_map[XFRM_MODE_MAX];
300	int (init_flags)(struct xfrm_state x);	300	int (init_flags)(struct xfrm_state x);
301	void (init_tempsel)(struct xfrm_state x, struct flowi *fl,	301	void (init_tempsel)(struct xfrm_selector sel, struct flowi *fl);
302	struct xfrm_tmpl *tmpl,	302	void (init_temprop)(struct xfrm_state x, struct xfrm_tmpl *tmpl,
303	xfrm_address_t daddr, xfrm_address_t saddr);	303	xfrm_address_t daddr, xfrm_address_t saddr);
304	int (tmpl_sort)(struct xfrm_tmpl dst, struct xfrm_tmpl *src, int n);	304	int (tmpl_sort)(struct xfrm_tmpl dst, struct xfrm_tmpl *src, int n);
305	int (state_sort)(struct xfrm_state dst, struct xfrm_state *src, int n);	305	int (state_sort)(struct xfrm_state dst, struct xfrm_state *src, int n);

ipc/sem.c+2−0

@@ -743,6 +743,8 @@ static unsigned long copy_semid_to_user(void __user buf, struct semid64_ds in, · 742 unmodified lines
743	{	743	{
744	struct semid_ds out;	744	struct semid_ds out;
745		745
		746	memset(&out, 0, sizeof(out));
		747
746	ipc64_perm_to_ipc_perm(&in->sem_perm, &out.sem_perm);	748	ipc64_perm_to_ipc_perm(&in->sem_perm, &out.sem_perm);
747		749
748	out.sem_otime = in->sem_otime;	750	out.sem_otime = in->sem_otime;

kernel/fork.c+1−1

 		if (IS_ERR(pol))
 			goto fail_nomem_policy;
 		vma_set_policy(tmp, pol);
+		tmp->vm_mm = mm;
 		if (anon_vma_fork(tmp, mpnt))
 			goto fail_nomem_anon_vma_fork;
 		tmp->vm_flags &= ~VM_LOCKED;
-		tmp->vm_mm = mm;
 		tmp->vm_next = tmp->vm_prev = NULL;
 		file = tmp->vm_file;
 		if (file) {

kernel/kfifo.c+0−2

@@ -365,8 +365,6 @@ static unsigned int setup_sgl(struct __kfifo fifo, struct scatterlist sgl, · 364 unmodified lines
365	n = setup_sgl_buf(sgl, fifo->data + off, nents, l);	365	n = setup_sgl_buf(sgl, fifo->data + off, nents, l);
366	n += setup_sgl_buf(sgl + n, fifo->data, nents - n, len - l);	366	n += setup_sgl_buf(sgl + n, fifo->data, nents - n, len - l);
367		367
368	if (n)
369	sg_mark_end(sgl + n - 1);
370	return n;	368	return n;
371	}	369	}
372		370

kernel/module.c+4−0

 {
 	struct module *mod = _mod;
 	list_del(&mod->list);
+	module_bug_cleanup(mod);
 	return 0;
 }
 	if (err < 0)
 		goto ddebug;
+	module_bug_finalize(info.hdr, info.sechdrs, mod);
 	list_add_rcu(&mod->list, &modules);
 	mutex_unlock(&module_mutex);
 	mutex_lock(&module_mutex);
 	/* Unlink carefully: kallsyms could be walking list. */
 	list_del_rcu(&mod->list);
+	module_bug_cleanup(mod);
  ddebug:
 	if (!mod->taints)
 		dynamic_debug_remove(info.debug);

kernel/smp.c+14−3

 EXPORT_SYMBOL_GPL(smp_call_function_any);
 /**
- * __smp_call_function_single(): Run a function on another CPU
+ * __smp_call_function_single(): Run a function on a specific CPU
  * @cpu: The CPU to run on.
  * @data: Pre-allocated and setup data structure
+ * @wait: If true, wait until function has completed on specified CPU.
  *
  * Like smp_call_function_single(), but allow caller to pass in a
  * pre-allocated data structure. Useful for embedding @data inside
 void __smp_call_function_single(int cpu, struct call_single_data *data,
 				int wait)
 {
-	csd_lock(data);
+	unsigned int this_cpu;
+	unsigned long flags;
+	this_cpu = get_cpu();
 	/*
 	 * Can deadlock when called with interrupts disabled.
 	 * We allow cpu's that are not yet online though, as no one else can
 	WARN_ON_ONCE(cpu_online(smp_processor_id()) && wait && irqs_disabled()
 		     && !oops_in_progress);
-	generic_exec_single(cpu, data, wait);
+	if (cpu == this_cpu) {
+		local_irq_save(flags);
+		data->func(data->info);
+		local_irq_restore(flags);
+	} else {
+		csd_lock(data);
+		generic_exec_single(cpu, data, wait);
+	}
+	put_cpu();
 }
 /**

lib/bug.c+2−4

 	return NULL;
 }
-int module_bug_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
+void module_bug_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
-			struct module *mod)
+			 struct module *mod)
 {
 	char *secstrings;
 	unsigned int i;
 	 * could potentially lead to deadlock and thus be counter-productive.
 	 */
 	list_add(&mod->bug_list, &module_bug_list);
-	return 0;
 }
 void module_bug_cleanup(struct module *mod)

lib/list_sort.c+1−1

@@ -70,7 +70,7 @@ static void merge_and_restore_back_links(void *priv, · 69 unmodified lines
70	* element comparison is needed, so the client's cmp()	70	* element comparison is needed, so the client's cmp()
71	* routine can invoke cond_resched() periodically.	71	* routine can invoke cond_resched() periodically.
72	*/	72	*/
73	(*cmp)(priv, tail, tail);	73	(*cmp)(priv, tail->next, tail->next);
74		74
75	tail->next->prev = tail;	75	tail->next->prev = tail;
76	tail = tail->next;	76	tail = tail->next;

mm/fremap.c+5−2

 {
 	struct mm_struct *mm = current->mm;
 	struct address_space *mapping;
-	unsigned long end = start + size;
 	struct vm_area_struct *vma;
 	int err = -EINVAL;
 	int has_write_lock = 0;
 	if (start + size <= start)
 		return err;
+	/* Does pgoff wrap? */
+	if (pgoff + (size >> PAGE_SHIFT) < pgoff)
+		return err;
 	/* Can we represent this offset inside this architecture's pte's? */
 #if PTE_FILE_MAX_BITS < BITS_PER_LONG
 	if (pgoff + (size >> PAGE_SHIFT) >= (1UL << PTE_FILE_MAX_BITS))
 	if (!(vma->vm_flags & VM_CAN_NONLINEAR))
 		goto out;
-	if (end <= start || start < vma->vm_start || end > vma->vm_end)
+	if (start < vma->vm_start || start + size > vma->vm_end)
 		goto out;
 	/* Must set VM_NONLINEAR before any pages are populated. */

mm/hugetlb.c+13−11

 	 * and just make the page writable */
 	avoidcopy = (page_mapcount(old_page) == 1);
 	if (avoidcopy) {
-		if (!trylock_page(old_page)) {
+		if (PageAnon(old_page))
-			if (PageAnon(old_page))
+			page_move_anon_rmap(old_page, vma, address);
-				page_move_anon_rmap(old_page, vma, address);
-		} else
-			unlock_page(old_page);
 		set_huge_ptep_writable(vma, address, ptep);
 		return 0;
 	}
 		set_huge_pte_at(mm, address, ptep,
 				make_huge_pte(vma, new_page, 1));
 		page_remove_rmap(old_page);
-		hugepage_add_anon_rmap(new_page, vma, address);
+		hugepage_add_new_anon_rmap(new_page, vma, address);
 		/* Make the old page be freed below */
 		new_page = old_page;
 		mmu_notifier_invalidate_range_end(mm,
 								vma, address);
 	}
-	if (!pagecache_page) {
+	/*
-		page = pte_page(entry);
+	 * hugetlb_cow() requires page locks of pte_page(entry) and
+	 * pagecache_page, so here we need take the former one
+	 * when page != pagecache_page or !pagecache_page.
+	 * Note that locking order is always pagecache_page -> page,
+	 * so no worry about deadlock.
+	 */
+	page = pte_page(entry);
+	if (page != pagecache_page)
 		lock_page(page);
-	}
 	spin_lock(&mm->page_table_lock);
 	/* Check for a racing update before calling hugetlb_cow */
 	if (pagecache_page) {
 		unlock_page(pagecache_page);
 		put_page(pagecache_page);
-	} else {
-		unlock_page(page);
 	}
+	unlock_page(page);
 out_mutex:
 	mutex_unlock(&hugetlb_instantiation_mutex);

mm/ksm.c+4−2

 	if (!ptep)
 		goto out;
-	if (pte_write(*ptep)) {
+	if (pte_write(*ptep) || pte_dirty(*ptep)) {
 		pte_t entry;
 		swapped = PageSwapCache(page);
 			set_pte_at(mm, addr, ptep, entry);
 			goto out_unlock;
 		}
-		entry = pte_wrprotect(entry);
+		if (pte_dirty(entry))
+			set_page_dirty(page);
+		entry = pte_mkclean(pte_wrprotect(entry));
 		set_pte_at_notify(mm, addr, ptep, entry);
 	}
 	*orig_pte = *ptep;

mm/mmap.c+1−0

@@ -2009,6 +2009,7 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, · 2008 unmodified lines
2009	removed_exe_file_vma(mm);	2009	removed_exe_file_vma(mm);
2010	fput(new->vm_file);	2010	fput(new->vm_file);
2011	}	2011	}
		2012	unlink_anon_vmas(new);
2012	out_free_mpol:	2013	out_free_mpol:
2013	mpol_put(pol);	2014	mpol_put(pol);
2014	out_free_vma:	2015	out_free_vma:

mm/oom_kill.c+26−23

 }
 /* return true if the task is not adequate as candidate victim task. */
-static bool oom_unkillable_task(struct task_struct *p, struct mem_cgroup *mem,
+static bool oom_unkillable_task(struct task_struct *p,
-			   const nodemask_t *nodemask)
+		const struct mem_cgroup *mem, const nodemask_t *nodemask)
 {
 	if (is_global_init(p))
 		return true;
 	 */
 	points += p->signal->oom_score_adj;
-	if (points < 0)
+	/*
-		return 0;
+	 * Never return 0 for an eligible task that may be killed since it's
+	 * possible that no single user task uses more than 0.1% of memory and
+	 * no single admin tasks uses more than 3.0%.
+	 */
+	if (points <= 0)
+		return 1;
 	return (points < 1000) ? points : 1000;
 }
 /**
  * dump_tasks - dump current memory state of all system tasks
  * @mem: current's memory controller, if constrained
+ * @nodemask: nodemask passed to page allocator for mempolicy ooms
  *
- * Dumps the current memory state of all system tasks, excluding kernel threads.
+ * Dumps the current memory state of all eligible tasks.  Tasks not in the same
+ * memcg, not in the same cpuset, or bound to a disjoint set of mempolicy nodes
+ * are not shown.
  * State information includes task's pid, uid, tgid, vm size, rss, cpu, oom_adj
  * value, oom_score_adj value, and name.
  *
- * If the actual is non-NULL, only tasks that are a member of the mem_cgroup are
- * shown.
- *
  * Call with tasklist_lock read-locked.
  */
-static void dump_tasks(const struct mem_cgroup *mem)
+static void dump_tasks(const struct mem_cgroup *mem, const nodemask_t *nodemask)
 {
 	struct task_struct *p;
 	struct task_struct *task;
 	pr_info("[ pid ]   uid  tgid total_vm      rss cpu oom_adj oom_score_adj name\n");
 	for_each_process(p) {
-		if (p->flags & PF_KTHREAD)
+		if (oom_unkillable_task(p, mem, nodemask))
-			continue;
-		if (mem && !task_in_mem_cgroup(p, mem))
 			continue;
 		task = find_lock_task_mm(p);
 }
 static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order,
-							struct mem_cgroup *mem)
+			struct mem_cgroup *mem, const nodemask_t *nodemask)
 {
 	task_lock(current);
 	pr_warning("%s invoked oom-killer: gfp_mask=0x%x, order=%d, "
 	mem_cgroup_print_oom_info(mem, p);
 	show_mem();
 	if (sysctl_oom_dump_tasks)
-		dump_tasks(mem);
+		dump_tasks(mem, nodemask);
 }
 #define K(x) ((x) << (PAGE_SHIFT-10))
 	unsigned int victim_points = 0;
 	if (printk_ratelimit())
-		dump_header(p, gfp_mask, order, mem);
+		dump_header(p, gfp_mask, order, mem, nodemask);
 	/*
 	 * If the task is already exiting, don't alarm the sysadmin or kill
  * Determines whether the kernel must panic because of the panic_on_oom sysctl.
  */
 static void check_panic_on_oom(enum oom_constraint constraint, gfp_t gfp_mask,
-				int order)
+				int order, const nodemask_t *nodemask)
 {
 	if (likely(!sysctl_panic_on_oom))
 		return;
 			return;
 	}
 	read_lock(&tasklist_lock);
-	dump_header(NULL, gfp_mask, order, NULL);
+	dump_header(NULL, gfp_mask, order, NULL, nodemask);
 	read_unlock(&tasklist_lock);
 	panic("Out of memory: %s panic_on_oom is enabled\n",
 		sysctl_panic_on_oom == 2 ? "compulsory" : "system-wide");
 	unsigned int points = 0;
 	struct task_struct *p;
-	check_panic_on_oom(CONSTRAINT_MEMCG, gfp_mask, 0);
+	check_panic_on_oom(CONSTRAINT_MEMCG, gfp_mask, 0, NULL);
 	limit = mem_cgroup_get_limit(mem) >> PAGE_SHIFT;
 	read_lock(&tasklist_lock);
 retry:
 void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
 		int order, nodemask_t *nodemask)
 {
+	const nodemask_t *mpol_mask;
 	struct task_struct *p;
 	unsigned long totalpages;
 	unsigned long freed = 0;
 	 */
 	constraint = constrained_alloc(zonelist, gfp_mask, nodemask,
 						&totalpages);
-	check_panic_on_oom(constraint, gfp_mask, order);
+	mpol_mask = (constraint == CONSTRAINT_MEMORY_POLICY) ? nodemask : NULL;
+	check_panic_on_oom(constraint, gfp_mask, order, mpol_mask);
 	read_lock(&tasklist_lock);
 	if (sysctl_oom_kill_allocating_task &&
 	}
 retry:
-	p = select_bad_process(&points, totalpages, NULL,
+	p = select_bad_process(&points, totalpages, NULL, mpol_mask);
-			constraint == CONSTRAINT_MEMORY_POLICY ? nodemask :
-								 NULL);
 	if (PTR_ERR(p) == -1UL)
 		goto out;
 	/* Found nothing?!?! Either we hang forever, or we panic. */
 	if (!p) {
-		dump_header(NULL, gfp_mask, order, NULL);
+		dump_header(NULL, gfp_mask, order, NULL, mpol_mask);
 		read_unlock(&tasklist_lock);
 		panic("Out of memory and no killable processes...\n");
 	}

mm/percpu.c+1−1

 			if (pcpu_first_unit_cpu == NR_CPUS)
 				pcpu_first_unit_cpu = cpu;
+			pcpu_last_unit_cpu = cpu;
 		}
 	}
-	pcpu_last_unit_cpu = cpu;
 	pcpu_nr_units = unit;
 	for_each_possible_cpu(cpu)

mm/rmap.c+16−7

@@ -381,7 +381,13 @@ vma_address(struct page page, struct vm_area_struct vma) · 380 unmodified lines
381	unsigned long page_address_in_vma(struct page page, struct vm_area_struct vma)	381	unsigned long page_address_in_vma(struct page page, struct vm_area_struct vma)
382	{	382	{
383	if (PageAnon(page)) {	383	if (PageAnon(page)) {
384	if (vma->anon_vma->root != page_anon_vma(page)->root)	384	struct anon_vma *page__anon_vma = page_anon_vma(page);
		385	/*
		386	* Note: swapoff's unuse_vma() is more efficient with this
		387	* check, and needs it to match anon_vma when KSM is active.
		388	*/
		389	if (!vma->anon_vma \|\| !page__anon_vma \|\|
		390	vma->anon_vma->root != page__anon_vma->root)
385	return -EFAULT;	391	return -EFAULT;
386	} else if (page->mapping && !(vma->vm_flags & VM_NONLINEAR)) {	392	} else if (page->mapping && !(vma->vm_flags & VM_NONLINEAR)) {
387	if (!vma->vm_file \|\|	393	if (!vma->vm_file \|\|
@@ -1564,13 +1570,14 @@ static void __hugepage_set_anon_rmap(struct page *page, · 1176 unmodified lines
1564	struct vm_area_struct *vma, unsigned long address, int exclusive)	1570	struct vm_area_struct *vma, unsigned long address, int exclusive)
1565	{	1571	{
1566	struct anon_vma *anon_vma = vma->anon_vma;	1572	struct anon_vma *anon_vma = vma->anon_vma;
		1573
1567	BUG_ON(!anon_vma);	1574	BUG_ON(!anon_vma);
1568	if (!exclusive) {	1575
1569	struct anon_vma_chain *avc;	1576	if (PageAnon(page))
1570	avc = list_entry(vma->anon_vma_chain.prev,	1577	return;
1571	struct anon_vma_chain, same_vma);	1578	if (!exclusive)
1572	anon_vma = avc->anon_vma;	1579	anon_vma = anon_vma->root;
1573	}	1580
1574	anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON;	1581	anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON;
1575	page->mapping = (struct address_space *) anon_vma;	1582	page->mapping = (struct address_space *) anon_vma;
1576	page->index = linear_page_index(vma, address);	1583	page->index = linear_page_index(vma, address);
@@ -1581,6 +1588,8 @@ void hugepage_add_anon_rmap(struct page *page, · 4 unmodified lines
1581	{	1588	{
1582	struct anon_vma *anon_vma = vma->anon_vma;	1589	struct anon_vma *anon_vma = vma->anon_vma;
1583	int first;	1590	int first;
		1591
		1592	BUG_ON(!PageLocked(page));
1584	BUG_ON(!anon_vma);	1593	BUG_ON(!anon_vma);
1585	BUG_ON(address < vma->vm_start \|\| address >= vma->vm_end);	1594	BUG_ON(address < vma->vm_start \|\| address >= vma->vm_end);
1586	first = atomic_inc_and_test(&page->_mapcount);	1595	first = atomic_inc_and_test(&page->_mapcount);

mm/vmscan.c+35−8

  * If a zone is deemed to be full of pinned pages then just give it a light
  * scan then give up on it.
  */
-static bool shrink_zones(int priority, struct zonelist *zonelist,
+static void shrink_zones(int priority, struct zonelist *zonelist,
 					struct scan_control *sc)
 {
 	struct zoneref *z;
 	struct zone *zone;
-	bool all_unreclaimable = true;
 	for_each_zone_zonelist_nodemask(zone, z, zonelist,
 					gfp_zone(sc->gfp_mask), sc->nodemask) {
 		}
 		shrink_zone(priority, zone, sc);
-		all_unreclaimable = false;
 	}
+}
+static bool zone_reclaimable(struct zone *zone)
+{
+	return zone->pages_scanned < zone_reclaimable_pages(zone) * 6;
+}
+/*
+ * As hibernation is going on, kswapd is freezed so that it can't mark
+ * the zone into all_unreclaimable. It can't handle OOM during hibernation.
+ * So let's check zone's unreclaimable in direct reclaim as well as kswapd.
+ */
+static bool all_unreclaimable(struct zonelist *zonelist,
+		struct scan_control *sc)
+{
+	struct zoneref *z;
+	struct zone *zone;
+	bool all_unreclaimable = true;
+	for_each_zone_zonelist_nodemask(zone, z, zonelist,
+			gfp_zone(sc->gfp_mask), sc->nodemask) {
+		if (!populated_zone(zone))
+			continue;
+		if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
+			continue;
+		if (zone_reclaimable(zone)) {
+			all_unreclaimable = false;
+			break;
+		}
+	}
 	return all_unreclaimable;
 }
 					struct scan_control *sc)
 {
 	int priority;
-	bool all_unreclaimable;
 	unsigned long total_scanned = 0;
 	struct reclaim_state *reclaim_state = current->reclaim_state;
 	struct zoneref *z;
 		sc->nr_scanned = 0;
 		if (!priority)
 			disable_swap_token();
-		all_unreclaimable = shrink_zones(priority, zonelist, sc);
+		shrink_zones(priority, zonelist, sc);
 		/*
 		 * Don't shrink slabs when reclaiming memory from
 		 * over limit cgroups
 		return sc->nr_reclaimed;
 	/* top priority shrink_zones still had more to do? don't OOM, then */
-	if (scanning_global_lru(sc) && !all_unreclaimable)
+	if (scanning_global_lru(sc) && !all_unreclaimable(zonelist, sc))
 		return 1;
 	return 0;
 			total_scanned += sc.nr_scanned;
 			if (zone->all_unreclaimable)
 				continue;
-			if (nr_slab == 0 &&
+			if (nr_slab == 0 && !zone_reclaimable(zone))
-			    zone->pages_scanned >= (zone_reclaimable_pages(zone) * 6))
 				zone->all_unreclaimable = 1;
 			/*
 			 * If we've done a decent amount of scanning and

net/8021q/vlan_core.c+10−4

 	if (vlan_dev)
 		skb->dev = vlan_dev;
-	else if (vlan_id)
+	else if (vlan_id) {
-		goto drop;
+		if (!(skb->dev->flags & IFF_PROMISC))
+			goto drop;
+		skb->pkt_type = PACKET_OTHERHOST;
+	}
 	return (polling ? netif_receive_skb(skb) : netif_rx(skb));
 	if (vlan_dev)
 		skb->dev = vlan_dev;
-	else if (vlan_id)
+	else if (vlan_id) {
-		goto drop;
+		if (!(skb->dev->flags & IFF_PROMISC))
+			goto drop;
+		skb->pkt_type = PACKET_OTHERHOST;
+	}
 	for (p = napi->gro_list; p; p = p->next) {
 		NAPI_GRO_CB(p)->same_flow =

net/9p/trans_rdma.c+18−11

@@ -426,8 +426,10 @@ static int rdma_request(struct p9_client client, struct p9_req_t req) · 425 unmodified lines
426		426
427	/* Allocate an fcall for the reply */	427	/* Allocate an fcall for the reply */
428	rpl_context = kmalloc(sizeof *rpl_context, GFP_KERNEL);	428	rpl_context = kmalloc(sizeof *rpl_context, GFP_KERNEL);
429	if (!rpl_context)	429	if (!rpl_context) {
		430	err = -ENOMEM;
430	goto err_close;	431	goto err_close;
		432	}
431		433
432	/*	434	/*
433	* If the request has a buffer, steal it, otherwise	435	* If the request has a buffer, steal it, otherwise
@@ -445,8 +447,8 @@ static int rdma_request(struct p9_client client, struct p9_req_t req) · 11 unmodified lines
445	}	447	}
446	rpl_context->rc = req->rc;	448	rpl_context->rc = req->rc;
447	if (!rpl_context->rc) {	449	if (!rpl_context->rc) {
448	kfree(rpl_context);	450	err = -ENOMEM;
449	goto err_close;	451	goto err_free2;
450	}	452	}
451		453
452	/*	454	/*
@@ -458,11 +460,8 @@ static int rdma_request(struct p9_client client, struct p9_req_t req) · 5 unmodified lines
458	*/	460	*/
459	if (atomic_inc_return(&rdma->rq_count) <= rdma->rq_depth) {	461	if (atomic_inc_return(&rdma->rq_count) <= rdma->rq_depth) {
460	err = post_recv(client, rpl_context);	462	err = post_recv(client, rpl_context);
461	if (err) {	463	if (err)
462	kfree(rpl_context->rc);	464	goto err_free1;
463	kfree(rpl_context);
464	goto err_close;
465	}
466	} else	465	} else
467	atomic_dec(&rdma->rq_count);	466	atomic_dec(&rdma->rq_count);
468		467
@@ -471,8 +470,10 @@ static int rdma_request(struct p9_client client, struct p9_req_t req) · 2 unmodified lines
471		470
472	/* Post the request */	471	/* Post the request */
473	c = kmalloc(sizeof *c, GFP_KERNEL);	472	c = kmalloc(sizeof *c, GFP_KERNEL);
474	if (!c)	473	if (!c) {
475	goto err_close;	474	err = -ENOMEM;
		475	goto err_free1;
		476	}
476	c->req = req;	477	c->req = req;
477		478
478	c->busa = ib_dma_map_single(rdma->cm_id->device,	479	c->busa = ib_dma_map_single(rdma->cm_id->device,
@@ -499,9 +500,15 @@ static int rdma_request(struct p9_client client, struct p9_req_t req) · 20 unmodified lines
499	return ib_post_send(rdma->qp, &wr, &bad_wr);	500	return ib_post_send(rdma->qp, &wr, &bad_wr);
500		501
501	error:	502	error:
		503	kfree(c);
		504	kfree(rpl_context->rc);
		505	kfree(rpl_context);
502	P9_DPRINTK(P9_DEBUG_ERROR, "EIO\n");	506	P9_DPRINTK(P9_DEBUG_ERROR, "EIO\n");
503	return -EIO;	507	return -EIO;
504		508	err_free1:
		509	kfree(rpl_context->rc);
		510	err_free2:
		511	kfree(rpl_context);
505	err_close:	512	err_close:
506	spin_lock_irqsave(&rdma->req_lock, flags);	513	spin_lock_irqsave(&rdma->req_lock, flags);
507	if (rdma->state < P9_RDMA_CLOSING) {	514	if (rdma->state < P9_RDMA_CLOSING) {

net/9p/trans_virtio.c+2−1

@@ -329,7 +329,8 @@ p9_virtio_create(struct p9_client client, const char devname, char *args) · 328 unmodified lines
329		329
330	mutex_lock(&virtio_9p_lock);	330	mutex_lock(&virtio_9p_lock);
331	list_for_each_entry(chan, &virtio_chan_list, chan_list) {	331	list_for_each_entry(chan, &virtio_chan_list, chan_list) {
332	if (!strncmp(devname, chan->tag, chan->tag_len)) {	332	if (!strncmp(devname, chan->tag, chan->tag_len) &&
		333	strlen(devname) == chan->tag_len) {
333	if (!chan->inuse) {	334	if (!chan->inuse) {
334	chan->inuse = true;	335	chan->inuse = true;
335	found = 1;	336	found = 1;

net/atm/br2684.c+2−10

 			unregister_netdev(net_dev);
 			free_netdev(net_dev);
 		}
-		read_lock_irq(&devs_lock);
-		if (list_empty(&br2684_devs)) {
-			/* last br2684 device */
-			unregister_atmdevice_notifier(&atm_dev_notifier);
-		}
-		read_unlock_irq(&devs_lock);
 		return;
 	}
 	if (list_empty(&br2684_devs)) {
 		/* 1st br2684 device */
-		register_atmdevice_notifier(&atm_dev_notifier);
 		brdev->number = 1;
 	} else
 		brdev->number = BRPRIV(list_entry_brdev(br2684_devs.prev))->number + 1;
 		return -ENOMEM;
 #endif
 	register_atm_ioctl(&br2684_ioctl_ops);
+	register_atmdevice_notifier(&atm_dev_notifier);
 	return 0;
 }
 #endif
-	/* if not already empty */
+	unregister_atmdevice_notifier(&atm_dev_notifier);
-	if (!list_empty(&br2684_devs))
-		unregister_atmdevice_notifier(&atm_dev_notifier);
 	while (!list_empty(&br2684_devs)) {
 		net_dev = list_entry_brdev(br2684_devs.next);

net/core/iovec.c+3−2

  *	in any case.
  */
-int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode)
+long verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode)
 {
-	int size, err, ct;
+	int size, ct;
+	long err;
 	if (m->msg_namelen) {
 		if (mode == VERIFY_READ) {

net/core/sock.c+4−4

@@ -1351,9 +1351,9 @@ int sock_i_uid(struct sock *sk) · 1350 unmodified lines
1351	{	1351	{
1352	int uid;	1352	int uid;
1353		1353
1354	read_lock(&sk->sk_callback_lock);	1354	read_lock_bh(&sk->sk_callback_lock);
1355	uid = sk->sk_socket ? SOCK_INODE(sk->sk_socket)->i_uid : 0;	1355	uid = sk->sk_socket ? SOCK_INODE(sk->sk_socket)->i_uid : 0;
1356	read_unlock(&sk->sk_callback_lock);	1356	read_unlock_bh(&sk->sk_callback_lock);
1357	return uid;	1357	return uid;
1358	}	1358	}
1359	EXPORT_SYMBOL(sock_i_uid);	1359	EXPORT_SYMBOL(sock_i_uid);
@@ -1362,9 +1362,9 @@ unsigned long sock_i_ino(struct sock *sk) · 2 unmodified lines
1362	{	1362	{
1363	unsigned long ino;	1363	unsigned long ino;
1364		1364
1365	read_lock(&sk->sk_callback_lock);	1365	read_lock_bh(&sk->sk_callback_lock);
1366	ino = sk->sk_socket ? SOCK_INODE(sk->sk_socket)->i_ino : 0;	1366	ino = sk->sk_socket ? SOCK_INODE(sk->sk_socket)->i_ino : 0;
1367	read_unlock(&sk->sk_callback_lock);	1367	read_unlock_bh(&sk->sk_callback_lock);
1368	return ino;	1368	return ino;
1369	}	1369	}
1370	EXPORT_SYMBOL(sock_i_ino);	1370	EXPORT_SYMBOL(sock_i_ino);

net/ipv4/Kconfig+1−0

@@ -217,6 +217,7 @@ config NET_IPIP · 216 unmodified lines
217		217
218	config NET_IPGRE	218	config NET_IPGRE
219	tristate "IP: GRE tunnels over IP"	219	tristate "IP: GRE tunnels over IP"
		220	depends on IPV6 \|\| IPV6=n
220	help	221	help
221	Tunneling means encapsulating data of one protocol type within	222	Tunneling means encapsulating data of one protocol type within
222	another protocol and sending it over a channel that understands the	223	another protocol and sending it over a channel that understands the

net/ipv4/ip_gre.c+4−4

@@ -45,7 +45,7 @@ · 44 unmodified lines
45	#include <net/netns/generic.h>	45	#include <net/netns/generic.h>
46	#include <net/rtnetlink.h>	46	#include <net/rtnetlink.h>
47		47
48	#ifdef CONFIG_IPV6	48	#if defined(CONFIG_IPV6) \|\| defined(CONFIG_IPV6_MODULE)
49	#include <net/ipv6.h>	49	#include <net/ipv6.h>
50	#include <net/ip6_fib.h>	50	#include <net/ip6_fib.h>
51	#include <net/ip6_route.h>	51	#include <net/ip6_route.h>
@@ -699,7 +699,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff skb, struct net_device dev · 647 unmodified lines
699	if ((dst = rt->rt_gateway) == 0)	699	if ((dst = rt->rt_gateway) == 0)
700	goto tx_error_icmp;	700	goto tx_error_icmp;
701	}	701	}
702	#ifdef CONFIG_IPV6	702	#if defined(CONFIG_IPV6) \|\| defined(CONFIG_IPV6_MODULE)
703	else if (skb->protocol == htons(ETH_P_IPV6)) {	703	else if (skb->protocol == htons(ETH_P_IPV6)) {
704	struct in6_addr *addr6;	704	struct in6_addr *addr6;
705	int addr_type;	705	int addr_type;
@@ -774,7 +774,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff skb, struct net_device dev · 68 unmodified lines
774	goto tx_error;	774	goto tx_error;
775	}	775	}
776	}	776	}
777	#ifdef CONFIG_IPV6	777	#if defined(CONFIG_IPV6) \|\| defined(CONFIG_IPV6_MODULE)
778	else if (skb->protocol == htons(ETH_P_IPV6)) {	778	else if (skb->protocol == htons(ETH_P_IPV6)) {
779	struct rt6_info rt6 = (struct rt6_info )skb_dst(skb);	779	struct rt6_info rt6 = (struct rt6_info )skb_dst(skb);
780		780
@@ -850,7 +850,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff skb, struct net_device dev · 69 unmodified lines
850	if ((iph->ttl = tiph->ttl) == 0) {	850	if ((iph->ttl = tiph->ttl) == 0) {
851	if (skb->protocol == htons(ETH_P_IP))	851	if (skb->protocol == htons(ETH_P_IP))
852	iph->ttl = old_iph->ttl;	852	iph->ttl = old_iph->ttl;
853	#ifdef CONFIG_IPV6	853	#if defined(CONFIG_IPV6) \|\| defined(CONFIG_IPV6_MODULE)
854	else if (skb->protocol == htons(ETH_P_IPV6))	854	else if (skb->protocol == htons(ETH_P_IPV6))
855	iph->ttl = ((struct ipv6hdr *)old_iph)->hop_limit;	855	iph->ttl = ((struct ipv6hdr *)old_iph)->hop_limit;
856	#endif	856	#endif

net/ipv4/ip_output.c+13−6

 	 * we can switch to copy when see the first bad fragment.
 	 */
 	if (skb_has_frags(skb)) {
-		struct sk_buff *frag;
+		struct sk_buff *frag, *frag2;
 		int first_len = skb_pagelen(skb);
-		int truesizes = 0;
 		if (first_len - hlen > mtu ||
 		    ((first_len - hlen) & 7) ||
 			if (frag->len > mtu ||
 			    ((frag->len & 7) && frag->next) ||
 			    skb_headroom(frag) < hlen)
-			    goto slow_path;
+				goto slow_path_clean;
 			/* Partially cloned skb? */
 			if (skb_shared(frag))
-				goto slow_path;
+				goto slow_path_clean;
 			BUG_ON(frag->sk);
 			if (skb->sk) {
 				frag->sk = skb->sk;
 				frag->destructor = sock_wfree;
 			}
-			truesizes += frag->truesize;
+			skb->truesize -= frag->truesize;
 		}
 		/* Everything is OK. Generate! */
 		frag = skb_shinfo(skb)->frag_list;
 		skb_frag_list_init(skb);
 		skb->data_len = first_len - skb_headlen(skb);
-		skb->truesize -= truesizes;
 		skb->len = first_len;
 		iph->tot_len = htons(first_len);
 		iph->frag_off = htons(IP_MF);
 		}
 		IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGFAILS);
 		return err;
+slow_path_clean:
+		skb_walk_frags(skb, frag2) {
+			if (frag2 == frag)
+				break;
+			frag2->sk = NULL;
+			frag2->destructor = NULL;
+			skb->truesize += frag2->truesize;
+		}
 	}
 slow_path:

net/ipv4/netfilter/ipt_REJECT.c+1−0

@@ -112,6 +112,7 @@ static void send_reset(struct sk_buff *oldskb, int hook) · 111 unmodified lines
112	/* ip_route_me_harder expects skb->dst to be set */	112	/* ip_route_me_harder expects skb->dst to be set */
113	skb_dst_set_noref(nskb, skb_dst(oldskb));	113	skb_dst_set_noref(nskb, skb_dst(oldskb));
114		114
		115	nskb->protocol = htons(ETH_P_IP);
115	if (ip_route_me_harder(nskb, addr_type))	116	if (ip_route_me_harder(nskb, addr_type))
116	goto free_nskb;	117	goto free_nskb;
117		118

net/ipv4/netfilter/nf_defrag_ipv4.c+3−1

 					  const struct net_device *out,
 					  int (*okfn)(struct sk_buff *))
 {
+	struct sock *sk = skb->sk;
 	struct inet_sock *inet = inet_sk(skb->sk);
-	if (inet && inet->nodefrag)
+	if (sk && (sk->sk_family == PF_INET) &&
+	    inet->nodefrag)
 		return NF_ACCEPT;
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

net/ipv4/netfilter/nf_nat_snmp_basic.c+4−2

 	unsigned char s[4];
 	if (offset & 1) {
-		s[0] = s[2] = 0;
+		s[0] = ~0;
 		s[1] = ~*optr;
+		s[2] = 0;
 		s[3] = *nptr;
 	} else {
-		s[1] = s[3] = 0;
 		s[0] = ~*optr;
+		s[1] = ~0;
 		s[2] = *nptr;
+		s[3] = 0;
 	}
 	*csum = csum_fold(csum_partial(s, 4, ~csum_unfold(*csum)));

net/ipv4/route.c+1−1

@@ -1231,7 +1231,7 @@ restart: · 1230 unmodified lines
1231	}	1231	}
1232		1232
1233	if (net_ratelimit())	1233	if (net_ratelimit())
1234	printk(KERN_WARNING "Neighbour table overflow.\n");	1234	printk(KERN_WARNING "ipv4: Neighbour table overflow.\n");
1235	rt_drop(rt);	1235	rt_drop(rt);
1236	return -ENOBUFS;	1236	return -ENOBUFS;
1237	}	1237	}

net/ipv4/tcp.c+6−3

 	 */
 	mask = 0;
-	if (sk->sk_err)
-		mask = POLLERR;
 	/*
 	 * POLLHUP is certainly not done right. But poll() doesn't
 		if (tp->urg_data & TCP_URG_VALID)
 			mask |= POLLPRI;
 	}
+	/* This barrier is coupled with smp_wmb() in tcp_reset() */
+	smp_rmb();
+	if (sk->sk_err)
+		mask |= POLLERR;
 	return mask;
 }
 EXPORT_SYMBOL(tcp_poll);
 	sg = sk->sk_route_caps & NETIF_F_SG;
 	while (--iovlen >= 0) {
-		int seglen = iov->iov_len;
+		size_t seglen = iov->iov_len;
 		unsigned char __user *from = iov->iov_base;
 		iov++;

net/ipv4/tcp_input.c+4−1

 			cnt += tcp_skb_pcount(skb);
 		if (cnt > packets) {
-			if (tcp_is_sack(tp) || (oldcnt >= packets))
+			if ((tcp_is_sack(tp) && !tcp_is_fack(tp)) ||
+			    (oldcnt >= packets))
 				break;
 			mss = skb_shinfo(skb)->gso_size;
 	default:
 		sk->sk_err = ECONNRESET;
 	}
+	/* This barrier is coupled with smp_rmb() in tcp_poll() */
+	smp_wmb();
 	if (!sock_flag(sk, SOCK_DEAD))
 		sk->sk_error_report(sk);

net/ipv4/tcp_timer.c+14−10

 /* This function calculates a "timeout" which is equivalent to the timeout of a
  * TCP connection after "boundary" unsuccessful, exponentially backed-off
- * retransmissions with an initial RTO of TCP_RTO_MIN.
+ * retransmissions with an initial RTO of TCP_RTO_MIN or TCP_TIMEOUT_INIT if
+ * syn_set flag is set.
  */
 static bool retransmits_timed_out(struct sock *sk,
-				  unsigned int boundary)
+				  unsigned int boundary,
+				  bool syn_set)
 {
 	unsigned int timeout, linear_backoff_thresh;
 	unsigned int start_ts;
+	unsigned int rto_base = syn_set ? TCP_TIMEOUT_INIT : TCP_RTO_MIN;
 	if (!inet_csk(sk)->icsk_retransmits)
 		return false;
 	else
 		start_ts = tcp_sk(sk)->retrans_stamp;
-	linear_backoff_thresh = ilog2(TCP_RTO_MAX/TCP_RTO_MIN);
+	linear_backoff_thresh = ilog2(TCP_RTO_MAX/rto_base);
 	if (boundary <= linear_backoff_thresh)
-		timeout = ((2 << boundary) - 1) * TCP_RTO_MIN;
+		timeout = ((2 << boundary) - 1) * rto_base;
 	else
-		timeout = ((2 << linear_backoff_thresh) - 1) * TCP_RTO_MIN +
+		timeout = ((2 << linear_backoff_thresh) - 1) * rto_base +
 			  (boundary - linear_backoff_thresh) * TCP_RTO_MAX;
 	return (tcp_time_stamp - start_ts) >= timeout;
 {
 	struct inet_connection_sock *icsk = inet_csk(sk);
 	int retry_until;
-	bool do_reset;
+	bool do_reset, syn_set = 0;
 	if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) {
 		if (icsk->icsk_retransmits)
 			dst_negative_advice(sk);
 		retry_until = icsk->icsk_syn_retries ? : sysctl_tcp_syn_retries;
+		syn_set = 1;
 	} else {
-		if (retransmits_timed_out(sk, sysctl_tcp_retries1)) {
+		if (retransmits_timed_out(sk, sysctl_tcp_retries1, 0)) {
 			/* Black hole detection */
 			tcp_mtu_probing(icsk, sk);
 			retry_until = tcp_orphan_retries(sk, alive);
 			do_reset = alive ||
-				   !retransmits_timed_out(sk, retry_until);
+				   !retransmits_timed_out(sk, retry_until, 0);
 			if (tcp_out_of_resources(sk, do_reset))
 				return 1;
 		}
 	}
-	if (retransmits_timed_out(sk, retry_until)) {
+	if (retransmits_timed_out(sk, retry_until, syn_set)) {
 		/* Has it gone just too far? */
 		tcp_write_err(sk);
 		return 1;
 		icsk->icsk_rto = min(icsk->icsk_rto << 1, TCP_RTO_MAX);
 	}
 	inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, icsk->icsk_rto, TCP_RTO_MAX);
-	if (retransmits_timed_out(sk, sysctl_tcp_retries1 + 1))
+	if (retransmits_timed_out(sk, sysctl_tcp_retries1 + 1, 0))
 		__sk_dst_reset(sk);
 out:;

net/ipv4/xfrm4_policy.c+1−1

@@ -61,7 +61,7 @@ static int xfrm4_get_saddr(struct net *net, · 60 unmodified lines
61		61
62	static int xfrm4_get_tos(struct flowi *fl)	62	static int xfrm4_get_tos(struct flowi *fl)
63	{	63	{
64	return fl->fl4_tos;	64	return IPTOS_RT_MASK & fl->fl4_tos; /* Strip ECN bits */
65	}	65	}
66		66
67	static int xfrm4_init_path(struct xfrm_dst path, struct dst_entry dst,	67	static int xfrm4_init_path(struct xfrm_dst path, struct dst_entry dst,

net/ipv4/xfrm4_state.c+19−14

 }
 static void
-__xfrm4_init_tempsel(struct xfrm_state *x, struct flowi *fl,
+__xfrm4_init_tempsel(struct xfrm_selector *sel, struct flowi *fl)
-		     struct xfrm_tmpl *tmpl,
+{
-		     xfrm_address_t *daddr, xfrm_address_t *saddr)
+	sel->daddr.a4 = fl->fl4_dst;
+	sel->saddr.a4 = fl->fl4_src;
+	sel->dport = xfrm_flowi_dport(fl);
+	sel->dport_mask = htons(0xffff);
+	sel->sport = xfrm_flowi_sport(fl);
+	sel->sport_mask = htons(0xffff);
+	sel->family = AF_INET;
+	sel->prefixlen_d = 32;
+	sel->prefixlen_s = 32;
+	sel->proto = fl->proto;
+	sel->ifindex = fl->oif;
+}
+static void
+xfrm4_init_temprop(struct xfrm_state *x, struct xfrm_tmpl *tmpl,
+		   xfrm_address_t *daddr, xfrm_address_t *saddr)
 {
-	x->sel.daddr.a4 = fl->fl4_dst;
-	x->sel.saddr.a4 = fl->fl4_src;
-	x->sel.dport = xfrm_flowi_dport(fl);
-	x->sel.dport_mask = htons(0xffff);
-	x->sel.sport = xfrm_flowi_sport(fl);
-	x->sel.sport_mask = htons(0xffff);
-	x->sel.family = AF_INET;
-	x->sel.prefixlen_d = 32;
-	x->sel.prefixlen_s = 32;
-	x->sel.proto = fl->proto;
-	x->sel.ifindex = fl->oif;
 	x->id = tmpl->id;
 	if (x->id.daddr.a4 == 0)
 		x->id.daddr.a4 = daddr->a4;
 	.owner			= THIS_MODULE,
 	.init_flags		= xfrm4_init_flags,
 	.init_tempsel		= __xfrm4_init_tempsel,
+	.init_temprop		= xfrm4_init_temprop,
 	.output			= xfrm4_output,
 	.extract_input		= xfrm4_extract_input,
 	.extract_output		= xfrm4_extract_output,

net/ipv6/addrconf.c+8−3

@@ -4637,10 +4637,12 @@ int __init addrconf_init(void) · 4636 unmodified lines
4637	if (err < 0) {	4637	if (err < 0) {
4638	printk(KERN_CRIT "IPv6 Addrconf:"	4638	printk(KERN_CRIT "IPv6 Addrconf:"
4639	" cannot initialize default policy table: %d.\n", err);	4639	" cannot initialize default policy table: %d.\n", err);
4640	return err;	4640	goto out;
4641	}	4641	}
4642		4642
4643	register_pernet_subsys(&addrconf_ops);	4643	err = register_pernet_subsys(&addrconf_ops);
		4644	if (err < 0)
		4645	goto out_addrlabel;
4644		4646
4645	/* The addrconf netdev notifier requires that loopback_dev	4647	/* The addrconf netdev notifier requires that loopback_dev
4646	* has it's ipv6 private information allocated and setup	4648	* has it's ipv6 private information allocated and setup
@@ -4692,7 +4694,9 @@ errout: · 45 unmodified lines
4692	unregister_netdevice_notifier(&ipv6_dev_notf);	4694	unregister_netdevice_notifier(&ipv6_dev_notf);
4693	errlo:	4695	errlo:
4694	unregister_pernet_subsys(&addrconf_ops);	4696	unregister_pernet_subsys(&addrconf_ops);
4695		4697	out_addrlabel:
		4698	ipv6_addr_label_cleanup();
		4699	out:
4696	return err;	4700	return err;
4697	}	4701	}
4698		4702
@@ -4703,6 +4707,7 @@ void addrconf_cleanup(void) · 4 unmodified lines
4703		4707
4704	unregister_netdevice_notifier(&ipv6_dev_notf);	4708	unregister_netdevice_notifier(&ipv6_dev_notf);
4705	unregister_pernet_subsys(&addrconf_ops);	4709	unregister_pernet_subsys(&addrconf_ops);
		4710	ipv6_addr_label_cleanup();
4706		4711
4707	rtnl_lock();	4712	rtnl_lock();
4708		4713

net/ipv6/addrlabel.c+5−0

 	return register_pernet_subsys(&ipv6_addr_label_ops);
 }
+void ipv6_addr_label_cleanup(void)
+{
+	unregister_pernet_subsys(&ipv6_addr_label_ops);
+}
 static const struct nla_policy ifal_policy[IFAL_MAX+1] = {
 	[IFAL_ADDRESS]		= { .len = sizeof(struct in6_addr), },
 	[IFAL_LABEL]		= { .len = sizeof(u32), },

net/ipv6/ip6_output.c+13−5

 	if (skb_has_frags(skb)) {
 		int first_len = skb_pagelen(skb);
-		int truesizes = 0;
+		struct sk_buff *frag2;
 		if (first_len - hlen > mtu ||
 		    ((first_len - hlen) & 7) ||
 			if (frag->len > mtu ||
 			    ((frag->len & 7) && frag->next) ||
 			    skb_headroom(frag) < hlen)
-			    goto slow_path;
+				goto slow_path_clean;
 			/* Partially cloned skb? */
 			if (skb_shared(frag))
-				goto slow_path;
+				goto slow_path_clean;
 			BUG_ON(frag->sk);
 			if (skb->sk) {
 				frag->sk = skb->sk;
 				frag->destructor = sock_wfree;
-				truesizes += frag->truesize;
 			}
+			skb->truesize -= frag->truesize;
 		}
 		err = 0;
 		first_len = skb_pagelen(skb);
 		skb->data_len = first_len - skb_headlen(skb);
-		skb->truesize -= truesizes;
 		skb->len = first_len;
 		ipv6_hdr(skb)->payload_len = htons(first_len -
 						   sizeof(struct ipv6hdr));
 			      IPSTATS_MIB_FRAGFAILS);
 		dst_release(&rt->dst);
 		return err;
+slow_path_clean:
+		skb_walk_frags(skb, frag2) {
+			if (frag2 == frag)
+				break;
+			frag2->sk = NULL;
+			frag2->destructor = NULL;
+			skb->truesize += frag2->truesize;
+		}
 	}
 slow_path:

net/ipv6/route.c+1−1

@@ -670,7 +670,7 @@ static struct rt6_info rt6_alloc_cow(struct rt6_info ort, struct in6_addr *dad · 669 unmodified lines
670		670
671	if (net_ratelimit())	671	if (net_ratelimit())
672	printk(KERN_WARNING	672	printk(KERN_WARNING
673	"Neighbour table overflow.\n");	673	"ipv6: Neighbour table overflow.\n");
674	dst_free(&rt->dst);	674	dst_free(&rt->dst);
675	return NULL;	675	return NULL;
676	}	676	}

net/ipv6/xfrm6_state.c+19−14

 #include <net/addrconf.h>
 static void
-__xfrm6_init_tempsel(struct xfrm_state *x, struct flowi *fl,
+__xfrm6_init_tempsel(struct xfrm_selector *sel, struct flowi *fl)
-		     struct xfrm_tmpl *tmpl,
-		     xfrm_address_t *daddr, xfrm_address_t *saddr)
 {
 	/* Initialize temporary selector matching only
 	 * to current session. */
-	ipv6_addr_copy((struct in6_addr *)&x->sel.daddr, &fl->fl6_dst);
+	ipv6_addr_copy((struct in6_addr *)&sel->daddr, &fl->fl6_dst);
-	ipv6_addr_copy((struct in6_addr *)&x->sel.saddr, &fl->fl6_src);
+	ipv6_addr_copy((struct in6_addr *)&sel->saddr, &fl->fl6_src);
-	x->sel.dport = xfrm_flowi_dport(fl);
+	sel->dport = xfrm_flowi_dport(fl);
-	x->sel.dport_mask = htons(0xffff);
+	sel->dport_mask = htons(0xffff);
-	x->sel.sport = xfrm_flowi_sport(fl);
+	sel->sport = xfrm_flowi_sport(fl);
-	x->sel.sport_mask = htons(0xffff);
+	sel->sport_mask = htons(0xffff);
-	x->sel.family = AF_INET6;
+	sel->family = AF_INET6;
-	x->sel.prefixlen_d = 128;
+	sel->prefixlen_d = 128;
-	x->sel.prefixlen_s = 128;
+	sel->prefixlen_s = 128;
-	x->sel.proto = fl->proto;
+	sel->proto = fl->proto;
-	x->sel.ifindex = fl->oif;
+	sel->ifindex = fl->oif;
+}
+static void
+xfrm6_init_temprop(struct xfrm_state *x, struct xfrm_tmpl *tmpl,
+		   xfrm_address_t *daddr, xfrm_address_t *saddr)
+{
 	x->id = tmpl->id;
 	if (ipv6_addr_any((struct in6_addr*)&x->id.daddr))
 		memcpy(&x->id.daddr, daddr, sizeof(x->sel.daddr));
 	.eth_proto		= htons(ETH_P_IPV6),
 	.owner			= THIS_MODULE,
 	.init_tempsel		= __xfrm6_init_tempsel,
+	.init_temprop		= xfrm6_init_temprop,
 	.tmpl_sort		= __xfrm6_tmpl_sort,
 	.state_sort		= __xfrm6_state_sort,
 	.output			= xfrm6_output,

net/mac80211/rx.c+0−4

 	struct net_device *prev_dev = NULL;
 	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
-	if (status->flag & RX_FLAG_INTERNAL_CMTR)
-		goto out_free_skb;
 	if (skb_headroom(skb) < sizeof(*rthdr) &&
 	    pskb_expand_head(skb, sizeof(*rthdr), 0, GFP_ATOMIC))
 		goto out_free_skb;
 	} else
 		goto out_free_skb;
-	status->flag |= RX_FLAG_INTERNAL_CMTR;
 	return;
  out_free_skb:

net/netfilter/nf_conntrack_extend.c+3−1

 {
 	unsigned int off, len;
 	struct nf_ct_ext_type *t;
+	size_t alloc_size;
 	rcu_read_lock();
 	t = rcu_dereference(nf_ct_ext_types[id]);
 	BUG_ON(t == NULL);
 	off = ALIGN(sizeof(struct nf_ct_ext), t->align);
 	len = off + t->len;
+	alloc_size = t->alloc_size;
 	rcu_read_unlock();
-	*ext = kzalloc(t->alloc_size, gfp);
+	*ext = kzalloc(alloc_size, gfp);
 	if (!*ext)
 		return NULL;

net/netfilter/nf_conntrack_sip.c+1−1

@@ -1376,7 +1376,7 @@ static int sip_help_tcp(struct sk_buff *skb, unsigned int protoff, · 1375 unmodified lines
1376	unsigned int msglen, origlen;	1376	unsigned int msglen, origlen;
1377	const char dptr, end;	1377	const char dptr, end;
1378	s16 diff, tdiff = 0;	1378	s16 diff, tdiff = 0;
1379	int ret;	1379	int ret = NF_ACCEPT;
1380	typeof(nf_nat_sip_seq_adjust_hook) nf_nat_sip_seq_adjust;	1380	typeof(nf_nat_sip_seq_adjust_hook) nf_nat_sip_seq_adjust;
1381		1381
1382	if (ctinfo != IP_CT_ESTABLISHED &&	1382	if (ctinfo != IP_CT_ESTABLISHED &&

net/netfilter/nf_tproxy_core.c+5−1

 int
 nf_tproxy_assign_sock(struct sk_buff *skb, struct sock *sk)
 {
-	if (inet_sk(sk)->transparent) {
+	bool transparent = (sk->sk_state == TCP_TIME_WAIT) ?
+				inet_twsk(sk)->tw_transparent :
+				inet_sk(sk)->transparent;
+	if (transparent) {
 		skb_orphan(skb);
 		skb->sk = sk;
 		skb->destructor = nf_tproxy_destructor;

net/phonet/pep.c+2−1

 static int pipe_rcv_status(struct sock *sk, struct sk_buff *skb)
 {
 	struct pep_sock *pn = pep_sk(sk);
-	struct pnpipehdr *hdr = pnp_hdr(skb);
+	struct pnpipehdr *hdr;
 	int wake = 0;
 	if (!pskb_may_pull(skb, sizeof(*hdr) + 4))
 		return -EINVAL;
+	hdr = pnp_hdr(skb);
 	if (hdr->data[0] != PN_PEP_TYPE_COMMON) {
 		LIMIT_NETDEBUG(KERN_DEBUG"Phonet unknown PEP type: %u\n",
 				(unsigned)hdr->data[0]);

net/rds/tcp_connect.c+2−2

@@ -43,7 +43,7 @@ void rds_tcp_state_change(struct sock *sk) · 42 unmodified lines
43	struct rds_connection *conn;	43	struct rds_connection *conn;
44	struct rds_tcp_connection *tc;	44	struct rds_tcp_connection *tc;
45		45
46	read_lock(&sk->sk_callback_lock);	46	read_lock_bh(&sk->sk_callback_lock);
47	conn = sk->sk_user_data;	47	conn = sk->sk_user_data;
48	if (conn == NULL) {	48	if (conn == NULL) {
49	state_change = sk->sk_state_change;	49	state_change = sk->sk_state_change;
@@ -68,7 +68,7 @@ void rds_tcp_state_change(struct sock *sk) · 18 unmodified lines
68	break;	68	break;
69	}	69	}
70	out:	70	out:
71	read_unlock(&sk->sk_callback_lock);	71	read_unlock_bh(&sk->sk_callback_lock);
72	state_change(sk);	72	state_change(sk);
73	}	73	}
74		74

net/rds/tcp_listen.c+2−2

@@ -114,7 +114,7 @@ void rds_tcp_listen_data_ready(struct sock *sk, int bytes) · 113 unmodified lines
114		114
115	rdsdebug("listen data ready sk %p\n", sk);	115	rdsdebug("listen data ready sk %p\n", sk);
116		116
117	read_lock(&sk->sk_callback_lock);	117	read_lock_bh(&sk->sk_callback_lock);
118	ready = sk->sk_user_data;	118	ready = sk->sk_user_data;
119	if (ready == NULL) { /* check for teardown race */	119	if (ready == NULL) { /* check for teardown race */
120	ready = sk->sk_data_ready;	120	ready = sk->sk_data_ready;
@@ -131,7 +131,7 @@ void rds_tcp_listen_data_ready(struct sock *sk, int bytes) · 10 unmodified lines
131	queue_work(rds_wq, &rds_tcp_listen_work);	131	queue_work(rds_wq, &rds_tcp_listen_work);
132		132
133	out:	133	out:
134	read_unlock(&sk->sk_callback_lock);	134	read_unlock_bh(&sk->sk_callback_lock);
135	ready(sk, bytes);	135	ready(sk, bytes);
136	}	136	}
137		137

net/rds/tcp_recv.c+2−2

@@ -324,7 +324,7 @@ void rds_tcp_data_ready(struct sock *sk, int bytes) · 323 unmodified lines
324		324
325	rdsdebug("data ready sk %p bytes %d\n", sk, bytes);	325	rdsdebug("data ready sk %p bytes %d\n", sk, bytes);
326		326
327	read_lock(&sk->sk_callback_lock);	327	read_lock_bh(&sk->sk_callback_lock);
328	conn = sk->sk_user_data;	328	conn = sk->sk_user_data;
329	if (conn == NULL) { /* check for teardown race */	329	if (conn == NULL) { /* check for teardown race */
330	ready = sk->sk_data_ready;	330	ready = sk->sk_data_ready;
@@ -338,7 +338,7 @@ void rds_tcp_data_ready(struct sock *sk, int bytes) · 7 unmodified lines
338	if (rds_tcp_read_sock(conn, GFP_ATOMIC, KM_SOFTIRQ0) == -ENOMEM)	338	if (rds_tcp_read_sock(conn, GFP_ATOMIC, KM_SOFTIRQ0) == -ENOMEM)
339	queue_delayed_work(rds_wq, &conn->c_recv_w, 0);	339	queue_delayed_work(rds_wq, &conn->c_recv_w, 0);
340	out:	340	out:
341	read_unlock(&sk->sk_callback_lock);	341	read_unlock_bh(&sk->sk_callback_lock);
342	ready(sk, bytes);	342	ready(sk, bytes);
343	}	343	}
344		344

net/rds/tcp_send.c+2−2

@@ -224,7 +224,7 @@ void rds_tcp_write_space(struct sock *sk) · 223 unmodified lines
224	struct rds_connection *conn;	224	struct rds_connection *conn;
225	struct rds_tcp_connection *tc;	225	struct rds_tcp_connection *tc;
226		226
227	read_lock(&sk->sk_callback_lock);	227	read_lock_bh(&sk->sk_callback_lock);
228	conn = sk->sk_user_data;	228	conn = sk->sk_user_data;
229	if (conn == NULL) {	229	if (conn == NULL) {
230	write_space = sk->sk_write_space;	230	write_space = sk->sk_write_space;
@@ -244,7 +244,7 @@ void rds_tcp_write_space(struct sock *sk) · 13 unmodified lines
244	queue_delayed_work(rds_wq, &conn->c_send_w, 0);	244	queue_delayed_work(rds_wq, &conn->c_send_w, 0);
245		245
246	out:	246	out:
247	read_unlock(&sk->sk_callback_lock);	247	read_unlock_bh(&sk->sk_callback_lock);
248		248
249	/*	249	/*
250	* write_space is only called when data leaves tcp's send queue if	250	* write_space is only called when data leaves tcp's send queue if

net/rose/af_rose.c+2−2

@@ -679,7 +679,7 @@ static int rose_bind(struct socket sock, struct sockaddr uaddr, int addr_len) · 678 unmodified lines
679	if (addr_len == sizeof(struct sockaddr_rose) && addr->srose_ndigis > 1)	679	if (addr_len == sizeof(struct sockaddr_rose) && addr->srose_ndigis > 1)
680	return -EINVAL;	680	return -EINVAL;
681		681
682	if (addr->srose_ndigis > ROSE_MAX_DIGIS)	682	if ((unsigned int) addr->srose_ndigis > ROSE_MAX_DIGIS)
683	return -EINVAL;	683	return -EINVAL;
684		684
685	if ((dev = rose_dev_get(&addr->srose_addr)) == NULL) {	685	if ((dev = rose_dev_get(&addr->srose_addr)) == NULL) {
@@ -739,7 +739,7 @@ static int rose_connect(struct socket sock, struct sockaddr uaddr, int addr_le · 53 unmodified lines
739	if (addr_len == sizeof(struct sockaddr_rose) && addr->srose_ndigis > 1)	739	if (addr_len == sizeof(struct sockaddr_rose) && addr->srose_ndigis > 1)
740	return -EINVAL;	740	return -EINVAL;
741		741
742	if (addr->srose_ndigis > ROSE_MAX_DIGIS)	742	if ((unsigned int) addr->srose_ndigis > ROSE_MAX_DIGIS)
743	return -EINVAL;	743	return -EINVAL;
744		744
745	/* Source + Destination digis should not exceed ROSE_MAX_DIGIS */	745	/* Source + Destination digis should not exceed ROSE_MAX_DIGIS */

net/sunrpc/xprtsock.c+14−14

@@ -800,7 +800,7 @@ static void xs_udp_data_ready(struct sock *sk, int len) · 799 unmodified lines
800	u32 _xid;	800	u32 _xid;
801	__be32 *xp;	801	__be32 *xp;
802		802
803	read_lock(&sk->sk_callback_lock);	803	read_lock_bh(&sk->sk_callback_lock);
804	dprintk("RPC: xs_udp_data_ready...\n");	804	dprintk("RPC: xs_udp_data_ready...\n");
805	if (!(xprt = xprt_from_sock(sk)))	805	if (!(xprt = xprt_from_sock(sk)))
806	goto out;	806	goto out;
@@ -852,7 +852,7 @@ static void xs_udp_data_ready(struct sock *sk, int len) · 45 unmodified lines
852	dropit:	852	dropit:
853	skb_free_datagram(sk, skb);	853	skb_free_datagram(sk, skb);
854	out:	854	out:
855	read_unlock(&sk->sk_callback_lock);	855	read_unlock_bh(&sk->sk_callback_lock);
856	}	856	}
857		857
858	static inline void xs_tcp_read_fraghdr(struct rpc_xprt xprt, struct xdr_skb_reader desc)	858	static inline void xs_tcp_read_fraghdr(struct rpc_xprt xprt, struct xdr_skb_reader desc)
@@ -1229,7 +1229,7 @@ static void xs_tcp_data_ready(struct sock *sk, int bytes) · 370 unmodified lines
1229		1229
1230	dprintk("RPC: xs_tcp_data_ready...\n");	1230	dprintk("RPC: xs_tcp_data_ready...\n");
1231		1231
1232	read_lock(&sk->sk_callback_lock);	1232	read_lock_bh(&sk->sk_callback_lock);
1233	if (!(xprt = xprt_from_sock(sk)))	1233	if (!(xprt = xprt_from_sock(sk)))
1234	goto out;	1234	goto out;
1235	if (xprt->shutdown)	1235	if (xprt->shutdown)
@@ -1248,7 +1248,7 @@ static void xs_tcp_data_ready(struct sock *sk, int bytes) · 12 unmodified lines
1248	read = tcp_read_sock(sk, &rd_desc, xs_tcp_data_recv);	1248	read = tcp_read_sock(sk, &rd_desc, xs_tcp_data_recv);
1249	} while (read > 0);	1249	} while (read > 0);
1250	out:	1250	out:
1251	read_unlock(&sk->sk_callback_lock);	1251	read_unlock_bh(&sk->sk_callback_lock);
1252	}	1252	}
1253		1253
1254	/*	1254	/*
@@ -1301,7 +1301,7 @@ static void xs_tcp_state_change(struct sock *sk) · 46 unmodified lines
1301	{	1301	{
1302	struct rpc_xprt *xprt;	1302	struct rpc_xprt *xprt;
1303		1303
1304	read_lock(&sk->sk_callback_lock);	1304	read_lock_bh(&sk->sk_callback_lock);
1305	if (!(xprt = xprt_from_sock(sk)))	1305	if (!(xprt = xprt_from_sock(sk)))
1306	goto out;	1306	goto out;
1307	dprintk("RPC: xs_tcp_state_change client %p...\n", xprt);	1307	dprintk("RPC: xs_tcp_state_change client %p...\n", xprt);
@@ -1313,7 +1313,7 @@ static void xs_tcp_state_change(struct sock *sk) · 5 unmodified lines
1313		1313
1314	switch (sk->sk_state) {	1314	switch (sk->sk_state) {
1315	case TCP_ESTABLISHED:	1315	case TCP_ESTABLISHED:
1316	spin_lock_bh(&xprt->transport_lock);	1316	spin_lock(&xprt->transport_lock);
1317	if (!xprt_test_and_set_connected(xprt)) {	1317	if (!xprt_test_and_set_connected(xprt)) {
1318	struct sock_xprt *transport = container_of(xprt,	1318	struct sock_xprt *transport = container_of(xprt,
1319	struct sock_xprt, xprt);	1319	struct sock_xprt, xprt);
@@ -1327,7 +1327,7 @@ static void xs_tcp_state_change(struct sock *sk) · 7 unmodified lines
1327		1327
1328	xprt_wake_pending_tasks(xprt, -EAGAIN);	1328	xprt_wake_pending_tasks(xprt, -EAGAIN);
1329	}	1329	}
1330	spin_unlock_bh(&xprt->transport_lock);	1330	spin_unlock(&xprt->transport_lock);
1331	break;	1331	break;
1332	case TCP_FIN_WAIT1:	1332	case TCP_FIN_WAIT1:
1333	/* The client initiated a shutdown of the socket */	1333	/* The client initiated a shutdown of the socket */
@@ -1365,7 +1365,7 @@ static void xs_tcp_state_change(struct sock *sk) · 31 unmodified lines
1365	xs_sock_mark_closed(xprt);	1365	xs_sock_mark_closed(xprt);
1366	}	1366	}
1367	out:	1367	out:
1368	read_unlock(&sk->sk_callback_lock);	1368	read_unlock_bh(&sk->sk_callback_lock);
1369	}	1369	}
1370		1370
1371	/**	1371	/**
@@ -1376,7 +1376,7 @@ static void xs_error_report(struct sock *sk) · 4 unmodified lines
1376	{	1376	{
1377	struct rpc_xprt *xprt;	1377	struct rpc_xprt *xprt;
1378		1378
1379	read_lock(&sk->sk_callback_lock);	1379	read_lock_bh(&sk->sk_callback_lock);
1380	if (!(xprt = xprt_from_sock(sk)))	1380	if (!(xprt = xprt_from_sock(sk)))
1381	goto out;	1381	goto out;
1382	dprintk("RPC: %s client %p...\n"	1382	dprintk("RPC: %s client %p...\n"
@@ -1384,7 +1384,7 @@ static void xs_error_report(struct sock *sk) · 1 unmodified line
1384	__func__, xprt, sk->sk_err);	1384	__func__, xprt, sk->sk_err);
1385	xprt_wake_pending_tasks(xprt, -EAGAIN);	1385	xprt_wake_pending_tasks(xprt, -EAGAIN);
1386	out:	1386	out:
1387	read_unlock(&sk->sk_callback_lock);	1387	read_unlock_bh(&sk->sk_callback_lock);
1388	}	1388	}
1389		1389
1390	static void xs_write_space(struct sock *sk)	1390	static void xs_write_space(struct sock *sk)
@@ -1416,13 +1416,13 @@ static void xs_write_space(struct sock *sk) · 25 unmodified lines
1416	*/	1416	*/
1417	static void xs_udp_write_space(struct sock *sk)	1417	static void xs_udp_write_space(struct sock *sk)
1418	{	1418	{
1419	read_lock(&sk->sk_callback_lock);	1419	read_lock_bh(&sk->sk_callback_lock);
1420		1420
1421	/* from net/core/sock.c:sock_def_write_space */	1421	/* from net/core/sock.c:sock_def_write_space */
1422	if (sock_writeable(sk))	1422	if (sock_writeable(sk))
1423	xs_write_space(sk);	1423	xs_write_space(sk);
1424		1424
1425	read_unlock(&sk->sk_callback_lock);	1425	read_unlock_bh(&sk->sk_callback_lock);
1426	}	1426	}
1427		1427
1428	/**	1428	/**
@@ -1437,13 +1437,13 @@ static void xs_udp_write_space(struct sock *sk) · 8 unmodified lines
1437	*/	1437	*/
1438	static void xs_tcp_write_space(struct sock *sk)	1438	static void xs_tcp_write_space(struct sock *sk)
1439	{	1439	{
1440	read_lock(&sk->sk_callback_lock);	1440	read_lock_bh(&sk->sk_callback_lock);
1441		1441
1442	/* from net/core/stream.c:sk_stream_write_space */	1442	/* from net/core/stream.c:sk_stream_write_space */
1443	if (sk_stream_wspace(sk) >= sk_stream_min_wspace(sk))	1443	if (sk_stream_wspace(sk) >= sk_stream_min_wspace(sk))
1444	xs_write_space(sk);	1444	xs_write_space(sk);
1445		1445
1446	read_unlock(&sk->sk_callback_lock);	1446	read_unlock_bh(&sk->sk_callback_lock);
1447	}	1447	}
1448		1448
1449	static void xs_udp_do_set_buffer_size(struct rpc_xprt *xprt)	1449	static void xs_udp_do_set_buffer_size(struct rpc_xprt *xprt)

net/wireless/wext-priv.c+1−1

@@ -152,7 +152,7 @@ static int ioctl_private_iw_point(struct iw_point *iwp, unsigned int cmd, · 151 unmodified lines
152	} else if (!iwp->pointer)	152	} else if (!iwp->pointer)
153	return -EFAULT;	153	return -EFAULT;
154		154
155	extra = kmalloc(extra_size, GFP_KERNEL);	155	extra = kzalloc(extra_size, GFP_KERNEL);
156	if (!extra)	156	if (!extra)
157	return -ENOMEM;	157	return -ENOMEM;
158		158

net/xfrm/xfrm_policy.c+2−3

 		    tmpl->mode == XFRM_MODE_BEET) {
 			remote = &tmpl->id.daddr;
 			local = &tmpl->saddr;
-			family = tmpl->encap_family;
+			if (xfrm_addr_any(local, tmpl->encap_family)) {
-			if (xfrm_addr_any(local, family)) {
+				error = xfrm_get_saddr(net, &tmp, remote, tmpl->encap_family);
-				error = xfrm_get_saddr(net, &tmp, remote, family);
 				if (error)
 					goto fail;
 				local = &tmp;

net/xfrm/xfrm_state.c+27−18

 EXPORT_SYMBOL(xfrm_sad_getinfo);
 static int
-xfrm_init_tempsel(struct xfrm_state *x, struct flowi *fl,
+xfrm_init_tempstate(struct xfrm_state *x, struct flowi *fl,
-		  struct xfrm_tmpl *tmpl,
+		    struct xfrm_tmpl *tmpl,
-		  xfrm_address_t *daddr, xfrm_address_t *saddr,
+		    xfrm_address_t *daddr, xfrm_address_t *saddr,
-		  unsigned short family)
+		    unsigned short family)
 {
 	struct xfrm_state_afinfo *afinfo = xfrm_state_get_afinfo(family);
 	if (!afinfo)
 		return -1;
-	afinfo->init_tempsel(x, fl, tmpl, daddr, saddr);
+	afinfo->init_tempsel(&x->sel, fl);
+	if (family != tmpl->encap_family) {
+		xfrm_state_put_afinfo(afinfo);
+		afinfo = xfrm_state_get_afinfo(tmpl->encap_family);
+		if (!afinfo)
+			return -1;
+	}
+	afinfo->init_temprop(x, tmpl, daddr, saddr);
 	xfrm_state_put_afinfo(afinfo);
 	return 0;
 }
 	int error = 0;
 	struct xfrm_state *best = NULL;
 	u32 mark = pol->mark.v & pol->mark.m;
+	unsigned short encap_family = tmpl->encap_family;
 	to_put = NULL;
 	spin_lock_bh(&xfrm_state_lock);
-	h = xfrm_dst_hash(net, daddr, saddr, tmpl->reqid, family);
+	h = xfrm_dst_hash(net, daddr, saddr, tmpl->reqid, encap_family);
 	hlist_for_each_entry(x, entry, net->xfrm.state_bydst+h, bydst) {
-		if (x->props.family == family &&
+		if (x->props.family == encap_family &&
 		    x->props.reqid == tmpl->reqid &&
 		    (mark & x->mark.m) == x->mark.v &&
 		    !(x->props.flags & XFRM_STATE_WILDRECV) &&
-		    xfrm_state_addr_check(x, daddr, saddr, family) &&
+		    xfrm_state_addr_check(x, daddr, saddr, encap_family) &&
 		    tmpl->mode == x->props.mode &&
 		    tmpl->id.proto == x->id.proto &&
 		    (tmpl->id.spi == x->id.spi || !tmpl->id.spi))
-			xfrm_state_look_at(pol, x, fl, family, daddr, saddr,
+			xfrm_state_look_at(pol, x, fl, encap_family, daddr, saddr,
 					   &best, &acquire_in_progress, &error);
 	}
 	if (best)
 		goto found;
-	h_wildcard = xfrm_dst_hash(net, daddr, &saddr_wildcard, tmpl->reqid, family);
+	h_wildcard = xfrm_dst_hash(net, daddr, &saddr_wildcard, tmpl->reqid, encap_family);
 	hlist_for_each_entry(x, entry, net->xfrm.state_bydst+h_wildcard, bydst) {
-		if (x->props.family == family &&
+		if (x->props.family == encap_family &&
 		    x->props.reqid == tmpl->reqid &&
 		    (mark & x->mark.m) == x->mark.v &&
 		    !(x->props.flags & XFRM_STATE_WILDRECV) &&
-		    xfrm_state_addr_check(x, daddr, saddr, family) &&
+		    xfrm_state_addr_check(x, daddr, saddr, encap_family) &&
 		    tmpl->mode == x->props.mode &&
 		    tmpl->id.proto == x->id.proto &&
 		    (tmpl->id.spi == x->id.spi || !tmpl->id.spi))
-			xfrm_state_look_at(pol, x, fl, family, daddr, saddr,
+			xfrm_state_look_at(pol, x, fl, encap_family, daddr, saddr,
 					   &best, &acquire_in_progress, &error);
 	}
 	if (!x && !error && !acquire_in_progress) {
 		if (tmpl->id.spi &&
 		    (x0 = __xfrm_state_lookup(net, mark, daddr, tmpl->id.spi,
-					      tmpl->id.proto, family)) != NULL) {
+					      tmpl->id.proto, encap_family)) != NULL) {
 			to_put = x0;
 			error = -EEXIST;
 			goto out;
 			error = -ENOMEM;
 			goto out;
 		}
-		/* Initialize temporary selector matching only
+		/* Initialize temporary state matching only
 		 * to current session. */
-		xfrm_init_tempsel(x, fl, tmpl, daddr, saddr, family);
+		xfrm_init_tempstate(x, fl, tmpl, daddr, saddr, family);
 		memcpy(&x->mark, &pol->mark, sizeof(x->mark));
 		error = security_xfrm_state_alloc_acquire(x, pol->security, fl->secid);
 			x->km.state = XFRM_STATE_ACQ;
 			list_add(&x->km.all, &net->xfrm.state_all);
 			hlist_add_head(&x->bydst, net->xfrm.state_bydst+h);
-			h = xfrm_src_hash(net, daddr, saddr, family);
+			h = xfrm_src_hash(net, daddr, saddr, encap_family);
 			hlist_add_head(&x->bysrc, net->xfrm.state_bysrc+h);
 			if (x->id.spi) {
-				h = xfrm_spi_hash(net, &x->id.daddr, x->id.spi, x->id.proto, family);
+				h = xfrm_spi_hash(net, &x->id.daddr, x->id.spi, x->id.proto, encap_family);
 				hlist_add_head(&x->byspi, net->xfrm.state_byspi+h);
 			}
 			x->lft.hard_add_expires_seconds = net->xfrm.sysctl_acq_expires;

samples/kfifo/dma-example.c+9−8

 {
 	int			i;
 	unsigned int		ret;
+	unsigned int		nents;
 	struct scatterlist	sg[10];
 	printk(KERN_INFO "DMA fifo test start\n");
 	 * byte at the beginning, after the kfifo_skip().
 	 */
 	sg_init_table(sg, ARRAY_SIZE(sg));
-	ret = kfifo_dma_in_prepare(&fifo, sg, ARRAY_SIZE(sg), FIFO_SIZE);
+	nents = kfifo_dma_in_prepare(&fifo, sg, ARRAY_SIZE(sg), FIFO_SIZE);
-	printk(KERN_INFO "DMA sgl entries: %d\n", ret);
+	printk(KERN_INFO "DMA sgl entries: %d\n", nents);
-	if (!ret) {
+	if (!nents) {
 		/* fifo is full and no sgl was created */
 		printk(KERN_WARNING "error kfifo_dma_in_prepare\n");
 		return -EIO;
 	/* receive data */
 	printk(KERN_INFO "scatterlist for receive:\n");
-	for (i = 0; i < ARRAY_SIZE(sg); i++) {
+	for (i = 0; i < nents; i++) {
 		printk(KERN_INFO
 		"sg[%d] -> "
 		"page_link 0x%.8lx offset 0x%.8x length 0x%.8x\n",
 	kfifo_dma_in_finish(&fifo, ret);
 	/* Prepare to transmit data, example: 8 bytes */
-	ret = kfifo_dma_out_prepare(&fifo, sg, ARRAY_SIZE(sg), 8);
+	nents = kfifo_dma_out_prepare(&fifo, sg, ARRAY_SIZE(sg), 8);
-	printk(KERN_INFO "DMA sgl entries: %d\n", ret);
+	printk(KERN_INFO "DMA sgl entries: %d\n", nents);
-	if (!ret) {
+	if (!nents) {
 		/* no data was available and no sgl was created */
 		printk(KERN_WARNING "error kfifo_dma_out_prepare\n");
 		return -EIO;
 	}
 	printk(KERN_INFO "scatterlist for transmit:\n");
-	for (i = 0; i < ARRAY_SIZE(sg); i++) {
+	for (i = 0; i < nents; i++) {
 		printk(KERN_INFO
 		"sg[%d] -> "
 		"page_link 0x%.8lx offset 0x%.8x length 0x%.8x\n",

security/tomoyo/common.c+5−1

 	const pid_t gpid = task_pid_nr(current);
 	static const int tomoyo_buffer_len = 4096;
 	char *buffer = kmalloc(tomoyo_buffer_len, GFP_NOFS);
+	pid_t ppid;
 	if (!buffer)
 		return NULL;
 	do_gettimeofday(&tv);
+	rcu_read_lock();
+	ppid = task_tgid_vnr(current->real_parent);
+	rcu_read_unlock();
 	snprintf(buffer, tomoyo_buffer_len - 1,
 		 "#timestamp=%lu profile=%u mode=%s (global-pid=%u)"
 		 " task={ pid=%u ppid=%u uid=%u gid=%u euid=%u"
 		 " egid=%u suid=%u sgid=%u fsuid=%u fsgid=%u }",
 		 tv.tv_sec, r->profile, tomoyo_mode[r->mode], gpid,
-		 (pid_t) sys_getpid(), (pid_t) sys_getppid(),
+		 task_tgid_vnr(current), ppid,
 		 current_uid(), current_gid(), current_euid(),
 		 current_egid(), current_suid(), current_sgid(),
 		 current_fsuid(), current_fsgid());

security/tomoyo/common.h+0−3

@@ -689,9 +689,6 @@ struct tomoyo_profile { · 688 unmodified lines
689		689
690	/******** Function prototypes. ********/	690	/******** Function prototypes. ********/
691		691
692	extern asmlinkage long sys_getpid(void);
693	extern asmlinkage long sys_getppid(void);
694
695	/* Check whether the given string starts with the given keyword. */	692	/* Check whether the given string starts with the given keyword. */
696	bool tomoyo_str_starts(char *src, const char find);	693	bool tomoyo_str_starts(char *src, const char find);
697	/* Get tomoyo_realpath() of current process. */	694	/* Get tomoyo_realpath() of current process. */

sound/core/control.c+5−0

 /* max number of user-defined controls */
 #define MAX_USER_CONTROLS	32
+#define MAX_CONTROL_COUNT	1028
 struct snd_kctl_ioctl {
 	struct list_head list;		/* list of all ioctls */
 	if (snd_BUG_ON(!control || !control->count))
 		return NULL;
+	if (control->count > MAX_CONTROL_COUNT)
+		return NULL;
 	kctl = kzalloc(sizeof(*kctl) + sizeof(struct snd_kcontrol_volatile) * control->count, GFP_KERNEL);
 	if (kctl == NULL) {
 		snd_printk(KERN_ERR "Cannot allocate control instance\n");

sound/i2c/other/ak4xxx-adda.c+1−1

@@ -900,7 +900,7 @@ static int proc_init(struct snd_akm4xxx *ak) · 899 unmodified lines
900	return 0;	900	return 0;
901	}	901	}
902	#else /* !CONFIG_PROC_FS */	902	#else /* !CONFIG_PROC_FS */
903	static int proc_init(struct snd_akm4xxx *ak) {}	903	static int proc_init(struct snd_akm4xxx *ak) { return 0; }
904	#endif	904	#endif
905		905
906	int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak)	906	int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak)

sound/pci/hda/patch_analog.c+1−0

@@ -3641,6 +3641,7 @@ static struct snd_pci_quirk ad1984_cfg_tbl[] = { · 3640 unmodified lines
3641	/* Lenovo Thinkpad T61/X61 */	3641	/* Lenovo Thinkpad T61/X61 */
3642	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1984_THINKPAD),	3642	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1984_THINKPAD),
3643	SND_PCI_QUIRK(0x1028, 0x0214, "Dell T3400", AD1984_DELL_DESKTOP),	3643	SND_PCI_QUIRK(0x1028, 0x0214, "Dell T3400", AD1984_DELL_DESKTOP),
		3644	SND_PCI_QUIRK(0x1028, 0x0233, "Dell Latitude E6400", AD1984_DELL_DESKTOP),
3644	{}	3645	{}
3645	};	3646	};
3646		3647

sound/pci/hda/patch_realtek.c+16−6

 	}
 	if (spec->autocfg.dig_in_pin) {
-		hda_nid_t dig_nid;
+		dig_nid = codec->start_nid;
-		err = snd_hda_get_connections(codec,
+		for (i = 0; i < codec->num_nodes; i++, dig_nid++) {
-					      spec->autocfg.dig_in_pin,
+			unsigned int wcaps = get_wcaps(codec, dig_nid);
-					      &dig_nid, 1);
+			if (get_wcaps_type(wcaps) != AC_WID_AUD_IN)
-		if (err > 0)
+				continue;
-			spec->dig_in_nid = dig_nid;
+			if (!(wcaps & AC_WCAP_DIGITAL))
+				continue;
+			if (!(wcaps & AC_WCAP_CONN_LIST))
+				continue;
+			err = get_connection_index(codec, dig_nid,
+						   spec->autocfg.dig_in_pin);
+			if (err >= 0) {
+				spec->dig_in_nid = dig_nid;
+				break;
+			}
+		}
 	}
 }

sound/pci/oxygen/oxygen.c+4−0

 		chip->model.suspend = claro_suspend;
 		chip->model.resume = claro_resume;
 		chip->model.set_adc_params = set_ak5385_params;
+		chip->model.device_config = PLAYBACK_0_TO_I2S |
+					    PLAYBACK_1_TO_SPDIF |
+					    CAPTURE_0_FROM_I2S_2 |
+					    CAPTURE_1_FROM_SPDIF;
 		break;
 	}
 	if (id->driver_data == MODEL_MERIDIAN ||

sound/pci/rme9652/hdsp.c+1−0

@@ -4609,6 +4609,7 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep hw, struct file file, unsigne · 4608 unmodified lines
4609	if (err < 0)	4609	if (err < 0)
4610	return err;	4610	return err;
4611		4611
		4612	memset(&info, 0, sizeof(info));
4612	spin_lock_irqsave(&hdsp->lock, flags);	4613	spin_lock_irqsave(&hdsp->lock, flags);
4613	info.pref_sync_ref = (unsigned char)hdsp_pref_sync_ref(hdsp);	4614	info.pref_sync_ref = (unsigned char)hdsp_pref_sync_ref(hdsp);
4614	info.wordclock_sync_check = (unsigned char)hdsp_wc_sync_check(hdsp);	4615	info.wordclock_sync_check = (unsigned char)hdsp_wc_sync_check(hdsp);

sound/pci/rme9652/hdspm.c+1−0

@@ -4127,6 +4127,7 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file, · 4126 unmodified lines
4127		4127
4128	case SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO:	4128	case SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO:
4129		4129
		4130	memset(&info, 0, sizeof(info));
4130	spin_lock_irq(&hdspm->lock);	4131	spin_lock_irq(&hdspm->lock);
4131	info.pref_sync_ref = hdspm_pref_sync_ref(hdspm);	4132	info.pref_sync_ref = hdspm_pref_sync_ref(hdspm);
4132	info.wordclock_sync_check = hdspm_wc_sync_check(hdspm);	4133	info.wordclock_sync_check = hdspm_wc_sync_check(hdspm);

sound/soc/sh/migor.c+13−2

 #include <linux/firmware.h>
 #include <linux/module.h>
+#include <asm/clkdev.h>
 #include <asm/clock.h>
 #include <cpu/sh7722.h>
 };
 static struct clk siumckb_clk = {
-	.name		= "siumckb_clk",
-	.id		= -1,
 	.ops		= &siumckb_clk_ops,
 	.rate		= 0, /* initialised at run-time */
 };
+static struct clk_lookup *siumckb_lookup;
 static int migor_hw_params(struct snd_pcm_substream *substream,
 			   struct snd_pcm_hw_params *params)
 {
 	if (ret < 0)
 		return ret;
+	siumckb_lookup = clkdev_alloc(&siumckb_clk, "siumckb_clk", NULL);
+	if (!siumckb_lookup) {
+		ret = -ENOMEM;
+		goto eclkdevalloc;
+	}
+	clkdev_add(siumckb_lookup);
 	/* Port number used on this machine: port B */
 	migor_snd_device = platform_device_alloc("soc-audio", 1);
 	if (!migor_snd_device) {
 epdevadd:
 	platform_device_put(migor_snd_device);
 epdevalloc:
+	clkdev_drop(siumckb_lookup);
+eclkdevalloc:
 	clk_unregister(&siumckb_clk);
 	return ret;
 }
 static void __exit migor_exit(void)
 {
+	clkdev_drop(siumckb_lookup);
 	clk_unregister(&siumckb_clk);
 	platform_device_unregister(migor_snd_device);
 }

sound/soc/soc-cache.c+3−2

@@ -203,8 +203,9 @@ static int snd_soc_8_16_write(struct snd_soc_codec *codec, unsigned int reg, · 202 unmodified lines
203	data[1] = (value >> 8) & 0xff;	203	data[1] = (value >> 8) & 0xff;
204	data[2] = value & 0xff;	204	data[2] = value & 0xff;
205		205
206	if (!snd_soc_codec_volatile_register(codec, reg))	206	if (!snd_soc_codec_volatile_register(codec, reg)
207	reg_cache[reg] = value;	207	&& reg < codec->reg_cache_size)
		208	reg_cache[reg] = value;
208		209
209	if (codec->cache_only) {	210	if (codec->cache_only) {
210	codec->cache_sync = 1;	211	codec->cache_sync = 1;

virt/kvm/eventfd.c+2−1

 	events = file->f_op->poll(file, &irqfd->pt);
 	list_add_tail(&irqfd->list, &kvm->irqfds.items);
-	spin_unlock_irq(&kvm->irqfds.lock);
 	/*
 	 * Check if there was an event already pending on the eventfd
 	if (events & POLLIN)
 		schedule_work(&irqfd->inject);
+	spin_unlock_irq(&kvm->irqfds.lock);
 	/*
 	 * do not drop the file until the irqfd is fully initialized, otherwise
 	 * we might race against the POLLHUP

virt/kvm/kvm_main.c+3−1

 asmlinkage void kvm_handle_fault_on_reboot(void)
 {
-	if (kvm_rebooting)
+	if (kvm_rebooting) {
 		/* spin while reset goes on */
+		local_irq_enable();
 		while (true)
 			;
+	}
 	/* Fault while not rebooting.  We want the trace. */
 	BUG();
 }

Merge commit 'v2.6.36-rc7' into perf/core

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code