Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e62133b4ea0d85888d9883a3e1c396ea8717bc26

Authored by Heiko Carstens
Committed by Martin Schwidefsky
1 parent 3b74a87422
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[S390] Get rid of new section mismatch warnings. 

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

Showing 5 changed files with 8 additions and 9 deletions Side-by-side Diff

arch/s390/kernel/head.S
Diff comments   View file @ e62133b
... ... @@ -35,6 +35,7 @@
35 35 #define ARCH_OFFSET 0
36 36 #endif
37 37  
  38 +.section ".text.head","ax"
38 39 #ifndef CONFIG_IPL
39 40 .org 0
40 41 .long 0x00080000,0x80000000+startup # Just a restart PSW
arch/s390/kernel/vmlinux.lds.S
Diff comments   View file @ e62133b
... ... @@ -21,6 +21,7 @@
21 21 . = 0x00000000;
22 22 _text = .; /* Text and read-only data */
23 23 .text : {
  24 + *(.text.head)
24 25 TEXT_TEXT
25 26 SCHED_TEXT
26 27 LOCK_TEXT
... ... @@ -29,8 +29,8 @@
29 29  
30 30 static LIST_HEAD(mem_segs);
31 31  
32   -void memmap_init(unsigned long size, int nid, unsigned long zone,
33   - unsigned long start_pfn)
  32 +void __meminit memmap_init(unsigned long size, int nid, unsigned long zone,
  33 + unsigned long start_pfn)
34 34 {
35 35 struct page *start, *end;
36 36 struct page *map_start, *map_end;
... ... @@ -66,7 +66,7 @@
66 66 }
67 67 }
68 68  
69   -static inline void *vmem_alloc_pages(unsigned int order)
  69 +static void __init_refok *vmem_alloc_pages(unsigned int order)
70 70 {
71 71 if (slab_is_available())
72 72 return (void *)__get_free_pages(GFP_KERNEL, order);
drivers/s390/char/raw3270.c
Diff comments   View file @ e62133b
... ... @@ -147,8 +147,7 @@
147 147 * Allocate a new 3270 ccw request from bootmem. Only works very
148 148 * early in the boot process. Only con3270.c should be using this.
149 149 */
150   -struct raw3270_request *
151   -raw3270_request_alloc_bootmem(size_t size)
  150 +struct raw3270_request __init *raw3270_request_alloc_bootmem(size_t size)
152 151 {
153 152 struct raw3270_request *rq;
154 153  
... ... @@ -848,8 +847,7 @@
848 847 /*
849 848 * Setup 3270 device configured as console.
850 849 */
851   -struct raw3270 *
852   -raw3270_setup_console(struct ccw_device *cdev)
  850 +struct raw3270 __init *raw3270_setup_console(struct ccw_device *cdev)
853 851 {
854 852 struct raw3270 *rp;
855 853 char *ascebc;
drivers/s390/char/sclp_vt220.c
Diff comments   View file @ e62133b
... ... @@ -621,8 +621,7 @@
621 621 /*
622 622 * Initialize all relevant components and register driver with system.
623 623 */
624   -static int
625   -__sclp_vt220_init(int early)
  624 +static int __init_refok __sclp_vt220_init(int early)
626 625 {
627 626 void *page;
628 627 int i;