diff options
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/kernel/leon_pci.c | 9 | ||||
-rw-r--r-- | arch/sparc/kernel/module.c | 13 | ||||
-rw-r--r-- | arch/sparc/kernel/pci.c | 4 |
3 files changed, 5 insertions, 21 deletions
diff --git a/arch/sparc/kernel/leon_pci.c b/arch/sparc/kernel/leon_pci.c index 21dcda75a520..fc0521161568 100644 --- a/arch/sparc/kernel/leon_pci.c +++ b/arch/sparc/kernel/leon_pci.c | |||
@@ -102,15 +102,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
102 | return pci_enable_resources(dev, mask); | 102 | return pci_enable_resources(dev, mask); |
103 | } | 103 | } |
104 | 104 | ||
105 | void __devinit pcibios_update_irq(struct pci_dev *dev, int irq) | ||
106 | { | ||
107 | #ifdef CONFIG_PCI_DEBUG | ||
108 | printk(KERN_DEBUG "LEONPCI: Assigning IRQ %02d to %s\n", irq, | ||
109 | pci_name(dev)); | ||
110 | #endif | ||
111 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); | ||
112 | } | ||
113 | |||
114 | /* in/out routines taken from pcic.c | 105 | /* in/out routines taken from pcic.c |
115 | * | 106 | * |
116 | * This probably belongs here rather than ioport.c because | 107 | * This probably belongs here rather than ioport.c because |
diff --git a/arch/sparc/kernel/module.c b/arch/sparc/kernel/module.c index 15e0a1693976..f1ddc0d23679 100644 --- a/arch/sparc/kernel/module.c +++ b/arch/sparc/kernel/module.c | |||
@@ -48,9 +48,7 @@ void *module_alloc(unsigned long size) | |||
48 | return NULL; | 48 | return NULL; |
49 | 49 | ||
50 | ret = module_map(size); | 50 | ret = module_map(size); |
51 | if (!ret) | 51 | if (ret) |
52 | ret = ERR_PTR(-ENOMEM); | ||
53 | else | ||
54 | memset(ret, 0, size); | 52 | memset(ret, 0, size); |
55 | 53 | ||
56 | return ret; | 54 | return ret; |
@@ -116,6 +114,10 @@ int apply_relocate_add(Elf_Shdr *sechdrs, | |||
116 | v = sym->st_value + rel[i].r_addend; | 114 | v = sym->st_value + rel[i].r_addend; |
117 | 115 | ||
118 | switch (ELF_R_TYPE(rel[i].r_info) & 0xff) { | 116 | switch (ELF_R_TYPE(rel[i].r_info) & 0xff) { |
117 | case R_SPARC_DISP32: | ||
118 | v -= (Elf_Addr) location; | ||
119 | *loc32 = v; | ||
120 | break; | ||
119 | #ifdef CONFIG_SPARC64 | 121 | #ifdef CONFIG_SPARC64 |
120 | case R_SPARC_64: | 122 | case R_SPARC_64: |
121 | location[0] = v >> 56; | 123 | location[0] = v >> 56; |
@@ -128,11 +130,6 @@ int apply_relocate_add(Elf_Shdr *sechdrs, | |||
128 | location[7] = v >> 0; | 130 | location[7] = v >> 0; |
129 | break; | 131 | break; |
130 | 132 | ||
131 | case R_SPARC_DISP32: | ||
132 | v -= (Elf_Addr) location; | ||
133 | *loc32 = v; | ||
134 | break; | ||
135 | |||
136 | case R_SPARC_WDISP19: | 133 | case R_SPARC_WDISP19: |
137 | v -= (Elf_Addr) location; | 134 | v -= (Elf_Addr) location; |
138 | *loc32 = (*loc32 & ~0x7ffff) | | 135 | *loc32 = (*loc32 & ~0x7ffff) | |
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index 065b88c4f868..acc8c838ff72 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c | |||
@@ -622,10 +622,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *pbus) | |||
622 | { | 622 | { |
623 | } | 623 | } |
624 | 624 | ||
625 | void pcibios_update_irq(struct pci_dev *pdev, int irq) | ||
626 | { | ||
627 | } | ||
628 | |||
629 | resource_size_t pcibios_align_resource(void *data, const struct resource *res, | 625 | resource_size_t pcibios_align_resource(void *data, const struct resource *res, |
630 | resource_size_t size, resource_size_t align) | 626 | resource_size_t size, resource_size_t align) |
631 | { | 627 | { |