Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecc25fbd authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'x86/apic', 'x86/defconfig', 'x86/memtest', 'x86/mm' and 'linus' into x86/core

parents 801c0be8 b5f26d05 15d4fcd6 63823126 34754b69 694593e3

Documentation/kernel-parameters.txt

+6 −1
Original line number Original line Diff line number Diff line
@@ -1308,8 +1308,13 @@ and is between 256 and 4096 characters. It is defined in the file 




	memtest=	[KNL,X86] Enable memtest

	memtest=	[KNL,X86] Enable memtest

			Format: <integer>

			Format: <integer>

			range: 0,4 : pattern number

			default : 0 <disable>

			default : 0 <disable>

			Specifies the number of memtest passes to be

			performed. Each pass selects another test

			pattern from a given set of patterns. Memtest

			fills the memory with this pattern, validates

			memory contents and reserves bad memory

			regions that are detected.





	meye.*=		[HW] Set MotionEye Camera parameters

	meye.*=		[HW] Set MotionEye Camera parameters

			See Documentation/video4linux/meye.txt.

			See Documentation/video4linux/meye.txt.

arch/arm/mach-rpc/riscpc.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/serial_8250.h>

#include <linux/serial_8250.h>

#include <linux/ata_platform.h>

#include <linux/ata_platform.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/i2c.h>





#include <asm/elf.h>

#include <asm/elf.h>

#include <asm/mach-types.h>

#include <asm/mach-types.h>
@@ -201,8 +202,13 @@ static struct platform_device *devs[] __initdata = { 
	&pata_device,

	&pata_device,

};

};





static struct i2c_board_info i2c_rtc = {

	I2C_BOARD_INFO("pcf8583", 0x50)

};



static int __init rpc_init(void)

static int __init rpc_init(void)

{

{

	i2c_register_board_info(0, &i2c_rtc, 1);

	return platform_add_devices(devs, ARRAY_SIZE(devs));

	return platform_add_devices(devs, ARRAY_SIZE(devs));

}

}

arch/x86/configs/i386_defconfig

+4 −2
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.29-rc4

# Linux kernel version: 2.6.29-rc4

# Thu Feb 12 12:57:57 2009

# Tue Feb 24 15:50:58 2009

#

#

# CONFIG_64BIT is not set

# CONFIG_64BIT is not set

CONFIG_X86_32=y

CONFIG_X86_32=y
@@ -266,7 +266,9 @@ CONFIG_PREEMPT_VOLUNTARY=y 
CONFIG_X86_LOCAL_APIC=y

CONFIG_X86_LOCAL_APIC=y

CONFIG_X86_IO_APIC=y

CONFIG_X86_IO_APIC=y

CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y

CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y

# CONFIG_X86_MCE is not set

CONFIG_X86_MCE=y

CONFIG_X86_MCE_NONFATAL=y

CONFIG_X86_MCE_P4THERMAL=y

CONFIG_VM86=y

CONFIG_VM86=y

# CONFIG_TOSHIBA is not set

# CONFIG_TOSHIBA is not set

# CONFIG_I8K is not set

# CONFIG_I8K is not set

arch/x86/configs/x86_64_defconfig

+4 −2
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.29-rc4

# Linux kernel version: 2.6.29-rc4

# Thu Feb 12 12:57:29 2009

# Tue Feb 24 15:44:16 2009

#

#

CONFIG_64BIT=y

CONFIG_64BIT=y

# CONFIG_X86_32 is not set

# CONFIG_X86_32 is not set
@@ -266,7 +266,9 @@ CONFIG_PREEMPT_VOLUNTARY=y 
CONFIG_X86_LOCAL_APIC=y

CONFIG_X86_LOCAL_APIC=y

CONFIG_X86_IO_APIC=y

CONFIG_X86_IO_APIC=y

CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y

CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y

# CONFIG_X86_MCE is not set

CONFIG_X86_MCE=y

CONFIG_X86_MCE_INTEL=y

CONFIG_X86_MCE_AMD=y

# CONFIG_I8K is not set

# CONFIG_I8K is not set

CONFIG_MICROCODE=y

CONFIG_MICROCODE=y

CONFIG_MICROCODE_INTEL=y

CONFIG_MICROCODE_INTEL=y

arch/x86/include/asm/uaccess_32.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -157,7 +157,7 @@ __copy_from_user(void *to, const void __user *from, unsigned long n) 
}

}





static __always_inline unsigned long __copy_from_user_nocache(void *to,

static __always_inline unsigned long __copy_from_user_nocache(void *to,

				const void __user *from, unsigned long n)

		const void __user *from, unsigned long n, unsigned long total)

{

{

	might_fault();

	might_fault();

	if (__builtin_constant_p(n)) {

	if (__builtin_constant_p(n)) {
@@ -180,7 +180,7 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to, 




static __always_inline unsigned long

static __always_inline unsigned long

__copy_from_user_inatomic_nocache(void *to, const void __user *from,

__copy_from_user_inatomic_nocache(void *to, const void __user *from,

				  unsigned long n)

				  unsigned long n, unsigned long total)

{

{

       return __copy_from_user_ll_nocache_nozero(to, from, n);

       return __copy_from_user_ll_nocache_nozero(to, from, n);

}

}