lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pull misc-2.6.39 into release branch

Browse Source
This commit is contained in:
Tony Luck
2011-03-16 09:57:50 -07:00
parent 521cb40b0c b4a6b34365
commit 4897313a62
6 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/ia64/configs/generic_defconfig
View File

@@ -233,3 +233,4 @@ CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRC_T10DIF=y CONFIG_CRC_T10DIF=y
CONFIG_MISC_DEVICES=y

1
arch/ia64/configs/gensparse_defconfig
View File

@@ -208,3 +208,4 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_MUTEXES=y
CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MD5=y
CONFIG_MISC_DEVICES=y

2
arch/ia64/include/asm/dma-mapping.h
View File

@@ -12,6 +12,8 @@
#define ARCH_HAS_DMA_GET_REQUIRED_MASK #define ARCH_HAS_DMA_GET_REQUIRED_MASK
#define DMA_ERROR_CODE 0
extern struct dma_map_ops *dma_ops; extern struct dma_map_ops *dma_ops;
extern struct ia64_machine_vector ia64_mv; extern struct ia64_machine_vector ia64_mv;
extern void set_iommu_machvec(void); extern void set_iommu_machvec(void);

5
arch/ia64/kernel/mca.c
View File

@@ -582,6 +582,8 @@ out:
/* Get the CPE error record and log it */ /* Get the CPE error record and log it */
ia64_mca_log_sal_error_record(SAL_INFO_TYPE_CPE); ia64_mca_log_sal_error_record(SAL_INFO_TYPE_CPE);
local_irq_disable();
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@@ -1859,7 +1861,8 @@ ia64_mca_cpu_init(void *cpu_data)
data = mca_bootmem(); data = mca_bootmem();
first_time = 0; first_time = 0;
} else } else
data = __get_free_pages(GFP_KERNEL, get_order(sz)); data = (void *)__get_free_pages(GFP_KERNEL,
get_order(sz));
if (!data) if (!data)
panic("Could not allocate MCA memory for cpu %d\n", panic("Could not allocate MCA memory for cpu %d\n",
cpu); cpu);

2
arch/ia64/sn/kernel/setup.c
View File

@@ -592,7 +592,7 @@ void __cpuinit sn_cpu_init(void)
/* /*
* Don't check status. The SAL call is not supported on all PROMs * Don't check status. The SAL call is not supported on all PROMs
* but a failure is harmless. * 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. * should set cpu_number on cpu 0 once.
*/ */
if (cpuid == 0) { if (cpuid == 0) {

2
arch/ia64/sn/pci/tioca_provider.c
View File

@@ -509,7 +509,7 @@ tioca_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir)
* use the GART mapped mode. * use the GART mapped mode.
*/ */
static u64 static u64
tioca_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags) tioca_dma_map(struct pci_dev *pdev, unsigned long paddr, size_t byte_count, int dma_flags)
{ {
u64 mapaddr; u64 mapaddr;