提交 ed5f6561 编写于 作者: A Al Viro 提交者: Linus Torvalds

deal with alpha section warnings

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 55fe9771
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
.section .text.head, "ax"
.globl swapper_pg_dir .globl swapper_pg_dir
.globl _stext .globl _stext
swapper_pg_dir=SWAPPER_PGD swapper_pg_dir=SWAPPER_PGD
......
...@@ -195,7 +195,7 @@ pcibios_init(void) ...@@ -195,7 +195,7 @@ pcibios_init(void)
subsys_initcall(pcibios_init); subsys_initcall(pcibios_init);
char * __init char * __devinit
pcibios_setup(char *str) pcibios_setup(char *str)
{ {
return str; return str;
...@@ -204,7 +204,7 @@ pcibios_setup(char *str) ...@@ -204,7 +204,7 @@ pcibios_setup(char *str)
#ifdef ALPHA_RESTORE_SRM_SETUP #ifdef ALPHA_RESTORE_SRM_SETUP
static struct pdev_srm_saved_conf *srm_saved_configs; static struct pdev_srm_saved_conf *srm_saved_configs;
void __init void __devinit
pdev_save_srm_config(struct pci_dev *dev) pdev_save_srm_config(struct pci_dev *dev)
{ {
struct pdev_srm_saved_conf *tmp; struct pdev_srm_saved_conf *tmp;
...@@ -247,14 +247,14 @@ pci_restore_srm_config(void) ...@@ -247,14 +247,14 @@ pci_restore_srm_config(void)
} }
#endif #endif
void __init void __devinit
pcibios_fixup_resource(struct resource *res, struct resource *root) pcibios_fixup_resource(struct resource *res, struct resource *root)
{ {
res->start += root->start; res->start += root->start;
res->end += root->start; res->end += root->start;
} }
void __init void __devinit
pcibios_fixup_device_resources(struct pci_dev *dev, struct pci_bus *bus) pcibios_fixup_device_resources(struct pci_dev *dev, struct pci_bus *bus)
{ {
/* Update device resources. */ /* Update device resources. */
...@@ -273,7 +273,7 @@ pcibios_fixup_device_resources(struct pci_dev *dev, struct pci_bus *bus) ...@@ -273,7 +273,7 @@ pcibios_fixup_device_resources(struct pci_dev *dev, struct pci_bus *bus)
} }
} }
void __init void __devinit
pcibios_fixup_bus(struct pci_bus *bus) pcibios_fixup_bus(struct pci_bus *bus)
{ {
/* Propagate hose info into the subordinate devices. */ /* Propagate hose info into the subordinate devices. */
......
...@@ -58,7 +58,7 @@ size_for_memory(unsigned long max) ...@@ -58,7 +58,7 @@ size_for_memory(unsigned long max)
return max; return max;
} }
struct pci_iommu_arena * struct pci_iommu_arena * __init
iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base, iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base,
unsigned long window_size, unsigned long align) unsigned long window_size, unsigned long align)
{ {
...@@ -117,7 +117,7 @@ iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base, ...@@ -117,7 +117,7 @@ iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base,
return arena; return arena;
} }
struct pci_iommu_arena * struct pci_iommu_arena * __init
iommu_arena_new(struct pci_controller *hose, dma_addr_t base, iommu_arena_new(struct pci_controller *hose, dma_addr_t base,
unsigned long window_size, unsigned long align) unsigned long window_size, unsigned long align)
{ {
......
...@@ -358,7 +358,7 @@ secondary_cpu_start(int cpuid, struct task_struct *idle) ...@@ -358,7 +358,7 @@ secondary_cpu_start(int cpuid, struct task_struct *idle)
/* /*
* Bring one cpu online. * Bring one cpu online.
*/ */
static int __devinit static int __cpuinit
smp_boot_one_cpu(int cpuid) smp_boot_one_cpu(int cpuid)
{ {
struct task_struct *idle; struct task_struct *idle;
...@@ -487,7 +487,7 @@ smp_prepare_boot_cpu(void) ...@@ -487,7 +487,7 @@ smp_prepare_boot_cpu(void)
{ {
} }
int __devinit int __cpuinit
__cpu_up(unsigned int cpu) __cpu_up(unsigned int cpu)
{ {
smp_boot_one_cpu(cpu); smp_boot_one_cpu(cpu);
...@@ -541,7 +541,7 @@ smp_percpu_timer_interrupt(struct pt_regs *regs) ...@@ -541,7 +541,7 @@ smp_percpu_timer_interrupt(struct pt_regs *regs)
set_irq_regs(old_regs); set_irq_regs(old_regs);
} }
int __init int
setup_profiling_timer(unsigned int multiplier) setup_profiling_timer(unsigned int multiplier)
{ {
return -EINVAL; return -EINVAL;
......
...@@ -15,6 +15,7 @@ SECTIONS ...@@ -15,6 +15,7 @@ SECTIONS
_text = .; /* Text and read-only data */ _text = .; /* Text and read-only data */
.text : { .text : {
*(.text.head)
TEXT_TEXT TEXT_TEXT
SCHED_TEXT SCHED_TEXT
LOCK_TEXT LOCK_TEXT
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册