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

Commit 4897313a authored by Tony Luck's avatar Tony Luck
Browse files

Pull misc-2.6.39 into release branch

parents 521cb40b b4a6b343

arch/ia64/configs/generic_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -233,3 +233,4 @@ CONFIG_CRYPTO_PCBC=m 
CONFIG_CRYPTO_MD5=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRC_T10DIF=y

CONFIG_MISC_DEVICES=y

arch/ia64/configs/gensparse_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -208,3 +208,4 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_CRYPTO_MD5=y

CONFIG_MISC_DEVICES=y

arch/ia64/include/asm/dma-mapping.h

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 


#define ARCH_HAS_DMA_GET_REQUIRED_MASK



#define DMA_ERROR_CODE 0



extern struct dma_map_ops *dma_ops;

extern struct ia64_machine_vector ia64_mv;

extern void set_iommu_machvec(void);

arch/ia64/kernel/mca.c

+4 −1
Original line number Diff line number Diff line
@@ -582,6 +582,8 @@ out: 
	/* Get the CPE error record and log it */

	ia64_mca_log_sal_error_record(SAL_INFO_TYPE_CPE);



	local_irq_disable();



	return IRQ_HANDLED;

}
@@ -1859,7 +1861,8 @@ ia64_mca_cpu_init(void *cpu_data) 
			data = mca_bootmem();

			first_time = 0;

		} else

			data = __get_free_pages(GFP_KERNEL, get_order(sz));

			data = (void *)__get_free_pages(GFP_KERNEL,

							get_order(sz));

		if (!data)

			panic("Could not allocate MCA memory for cpu %d\n",

					cpu);

arch/ia64/sn/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ void __cpuinit sn_cpu_init(void) 
	/*

	 * Don't check status. The SAL call is not supported on all PROMs

	 * but a failure is harmless.

	 * Architechtuallly, cpu_init is always called twice on cpu 0. We

	 * Architecturally, cpu_init is always called twice on cpu 0. We

	 * should set cpu_number on cpu 0 once.

	 */

	if (cpuid == 0) {