Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6:
arch/ia64/kernel/iosapic: missing test after ioremap()
ia64/topology.c: exit cache_add_dev when kobject_init_and_add fails
arch/ia64/Makefile: Remove -mtune=merced in IA64 kernel build
IA64: includecheck fix: ia64, pgtable.h
IA64: includecheck fix: ia64, ia64_ksyms.c
ia64: boolean __test_and_clear_bit
Bug Fix arch/ia64/kernel/pci-dma.c: fix recursive dma_supported() call in iommu_dma_supported()
+11
-16
-5
arch/ia64/Makefile
-5
arch/ia64/Makefile
···
41
41
ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz)
42
42
endif
43
43
44
-
ifeq ($(call cc-version),0304)
45
-
cflags-$(CONFIG_ITANIUM) += -mtune=merced
46
-
cflags-$(CONFIG_MCKINLEY) += -mtune=mckinley
47
-
endif
48
-
49
44
KBUILD_CFLAGS += $(cflags-y)
50
45
head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o
51
46
+1
-1
arch/ia64/include/asm/bitops.h
+1
-1
arch/ia64/include/asm/bitops.h
-1
arch/ia64/include/asm/pgtable.h
-1
arch/ia64/include/asm/pgtable.h
+1
-3
arch/ia64/kernel/ia64_ksyms.c
+1
-3
arch/ia64/kernel/ia64_ksyms.c
···
21
21
22
22
#include <asm/page.h>
23
23
EXPORT_SYMBOL(clear_page);
24
+
EXPORT_SYMBOL(copy_page);
24
25
25
26
#ifdef CONFIG_VIRTUAL_MEM_MAP
26
27
#include <linux/bootmem.h>
···
60
59
EXPORT_SYMBOL(__udivdi3);
61
60
EXPORT_SYMBOL(__moddi3);
62
61
EXPORT_SYMBOL(__umoddi3);
63
-
64
-
#include <asm/page.h>
65
-
EXPORT_SYMBOL(copy_page);
66
62
67
63
#if defined(CONFIG_MD_RAID456) || defined(CONFIG_MD_RAID456_MODULE)
68
64
extern void xor_ia64_2(void);
+4
arch/ia64/kernel/iosapic.c
+4
arch/ia64/kernel/iosapic.c
···
1072
1072
}
1073
1073
1074
1074
addr = ioremap(phys_addr, 0);
1075
+
if (addr == NULL) {
1076
+
spin_unlock_irqrestore(&iosapic_lock, flags);
1077
+
return -ENOMEM;
1078
+
}
1075
1079
ver = iosapic_version(addr);
1076
1080
if ((err = iosapic_check_gsi_range(gsi_base, ver))) {
1077
1081
iounmap(addr);
-5
arch/ia64/kernel/pci-dma.c
-5
arch/ia64/kernel/pci-dma.c
···
69
69
70
70
int iommu_dma_supported(struct device *dev, u64 mask)
71
71
{
72
-
struct dma_map_ops *ops = platform_dma_get_ops(dev);
73
-
74
-
if (ops->dma_supported)
75
-
return ops->dma_supported(dev, mask);
76
-
77
72
/* Copied from i386. Doesn't make much sense, because it will
78
73
only work for pci_alloc_coherent.
79
74
The caller just has to use GFP_DMA in this case. */
+5
-1
arch/ia64/kernel/topology.c
+5
-1
arch/ia64/kernel/topology.c
···
372
372
retval = kobject_init_and_add(&all_cpu_cache_info[cpu].kobj,
373
373
&cache_ktype_percpu_entry, &sys_dev->kobj,
374
374
"%s", "cache");
375
+
if (unlikely(retval < 0)) {
376
+
cpu_cache_sysfs_exit(cpu);
377
+
return retval;
378
+
}
375
379
376
380
for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) {
377
381
this_object = LEAF_KOBJECT_PTR(cpu,i);
···
389
385
}
390
386
kobject_put(&all_cpu_cache_info[cpu].kobj);
391
387
cpu_cache_sysfs_exit(cpu);
392
-
break;
388
+
return retval;
393
389
}
394
390
kobject_uevent(&(this_object->kobj), KOBJ_ADD);
395
391
}