2 files changed, 136 insertions, 127 deletions
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index 7af07d3ad5f0..55c05b511f4c 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -1,4 +1,5 @@
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/page.h>
 OUTPUT_FORMAT("elf64-alpha")
 OUTPUT_ARCH(alpha)
@@ -8,138 +9,145 @@ jiffies = jiffies_64;
 SECTIONS
 {
 #ifdef CONFIG_ALPHA_LEGACY_START_ADDRESS
-  . = 0xfffffc0000310000;
+        . = 0xfffffc0000310000;
 #else
-  . = 0xfffffc0001010000;
+        . = 0xfffffc0001010000;
 #endif
-  _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
-        *(.fixup)
+                *(.fixup)
-        *(.gnu.warning)
+                *(.gnu.warning)
-  } :kernel
+        } :kernel
-  _etext = .;                                   /* End of text section */
+        _etext = .;     /* End of text section */
-  . = ALIGN(16);
+        /* Exception table */
-  __start___ex_table = .;                       /* Exception table */
+        . = ALIGN(16);
-  __ex_table : { *(__ex_table) }
+        __ex_table : {
-  __stop___ex_table = .;
+                __start___ex_table = .;
+                *(__ex_table)
-  NOTES :kernel :note
+                __stop___ex_table = .;
-  .dummy : { *(.dummy) } :kernel
+        }
-  RODATA
+        NOTES :kernel :note
+        .dummy : {
-  /* Will be freed after init */
+                *(.dummy)
-  . = ALIGN(8192);                              /* Init code and data */
+        } :kernel
-  __init_begin = .;
-  .init.text : { 
+        RODATA
-        _sinittext = .;
-        *(.init.text)
+        /* Will be freed after init */
-        _einittext = .;
+        . = ALIGN(PAGE_SIZE);
-  }
+        /* Init code and data */
-  .init.data : { *(.init.data) }
+        __init_begin = .;
+        .init.text : {
-  . = ALIGN(16);
+                _sinittext = .;
-  __setup_start = .;
+                *(.init.text)
-  .init.setup : { *(.init.setup) }
+                _einittext = .;
-  __setup_end = .;
+        }
+        .init.data : {
-  . = ALIGN(8);
+                *(.init.data)
-  __initcall_start = .;
+        }
-  .initcall.init : {
-        INITCALLS
+        . = ALIGN(16);
-  }
+        .init.setup : {
-  __initcall_end = .;
+                __setup_start = .;
+                *(.init.setup)
+                __setup_end = .;
+        }
+        . = ALIGN(8);
+        .initcall.init : {
+                __initcall_start = .;
+                INITCALLS
+                __initcall_end = .;
+        }
 #ifdef CONFIG_BLK_DEV_INITRD
-  . = ALIGN(8192);
+        . = ALIGN(PAGE_SIZE);
-  __initramfs_start = .;
+        .init.ramfs : {
-  .init.ramfs : { *(.init.ramfs) }
+                __initramfs_start = .;
-  __initramfs_end = .;
+                *(.init.ramfs)
+                __initramfs_end = .;
+        }
 #endif
-  . = ALIGN(8);
+        . = ALIGN(8);
-  .con_initcall.init : {
+        .con_initcall.init : {
-        __con_initcall_start = .;
+                __con_initcall_start = .;
-        *(.con_initcall.init)
+                *(.con_initcall.init)
-        __con_initcall_end = .;
+                __con_initcall_end = .;
-  }
+        }
-  . = ALIGN(8);
+        . = ALIGN(8);
-  SECURITY_INIT
+        SECURITY_INIT
-  PERCPU(8192)
+        PERCPU(PAGE_SIZE)
-  . = ALIGN(2*8192);
+        . = ALIGN(2 * PAGE_SIZE);
-  __init_end = .;
+        __init_end = .;
-  /* Freed after init ends here */
+        /* Freed after init ends here */
-  /* Note 2 page alignment above.  */
+        /* Note 2 page alignment above.  */
-  .data.init_thread : { *(.data.init_thread) }
+        .data.init_thread : {
+                *(.data.init_thread)
-  . = ALIGN(8192);
+        }
-  .data.page_aligned : { *(.data.page_aligned) }
+        . = ALIGN(PAGE_SIZE);
-  . = ALIGN(64);
+        .data.page_aligned : {
-  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
+                *(.data.page_aligned)
+        }
-  _data = .;
-  .data : {                                     /* Data */
+        . = ALIGN(64);
-        DATA_DATA
+        .data.cacheline_aligned : {
-        CONSTRUCTORS
+                *(.data.cacheline_aligned)
-  }
+        }
-  .got : { *(.got) }
+        _data = .;
-  .sdata : { *(.sdata) }
+        /* Data */
+        .data : {
-  _edata = .;                                   /* End of data section */
+                DATA_DATA
+                CONSTRUCTORS
-  __bss_start = .;
+        }
-  .sbss : { *(.sbss) *(.scommon) }
-  .bss : { *(.bss) *(COMMON) }
+        .got : {
-  __bss_stop = .;
+                *(.got)
+        }
-  _end = .;
+        .sdata : {
+                *(.sdata)
-  /* Sections to be discarded */
+        }
-  /DISCARD/ : { *(.exit.text) *(.exit.data) *(.exitcall.exit) }
+        _edata = .;     /* End of data section */
-  .mdebug 0 : { *(.mdebug) }
+        __bss_start = .;
-  .note 0 : { *(.note) }
+        .sbss : {
-  .comment 0 : { *(.comment) }
+                *(.sbss)
+                *(.scommon)
-  /* Stabs debugging sections */
+        }
-  .stab 0 : { *(.stab) }
+        .bss : {
-  .stabstr 0 : { *(.stabstr) }
+                *(.bss)
-  .stab.excl 0 : { *(.stab.excl) }
+                *(COMMON)
-  .stab.exclstr 0 : { *(.stab.exclstr) }
+        }
-  .stab.index 0 : { *(.stab.index) }
+        __bss_stop = .;
-  .stab.indexstr 0 : { *(.stab.indexstr) }
+        _end = .;
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
+        /* Sections to be discarded */
-  .line           0 : { *(.line) }
+        /DISCARD/ : {
-  /* GNU DWARF 1 extensions */
+                *(.exit.text)
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+                *(.exit.data)
-  .debug_sfnames  0 : { *(.debug_sfnames) }
+                *(.exitcall.exit)
-  /* DWARF 1.1 and DWARF 2 */
+        }
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
+        .mdebug 0 : {
-  /* DWARF 2 */
+                *(.mdebug)
-  .debug_info     0 : { *(.debug_info) }
+        }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
+        .note 0 : {
-  .debug_line     0 : { *(.debug_line) }
+                *(.note)
-  .debug_frame    0 : { *(.debug_frame) }
+        }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
+        STABS_DEBUG
-  .debug_macinfo  0 : { *(.debug_macinfo) }
+        DWARF_DEBUG
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
 }
diff --git a/include/asm-alpha/page.h b/include/asm-alpha/page.h
index bae7f05716d4..8cc97bfd3789 100644
--- a/include/asm-alpha/page.h
+++ b/include/asm-alpha/page.h
@@ -3,11 +3,12 @@
 #ifdef __KERNEL__
+#include <linux/const.h>
 #include <asm/pal.h>
 /* PAGE_SHIFT determines the page size */
 #define PAGE_SHIFT      13
-#define PAGE_SIZE       (1UL << PAGE_SHIFT)
+#define PAGE_SIZE       (_AC(1,UL) << PAGE_SHIFT)
 #define PAGE_MASK       (~(PAGE_SIZE-1))
 #ifndef __ASSEMBLY__

diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S index 7af07d3ad5f0..55c05b511f4c 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -1,4 +1,5 @@
1	#include <asm-generic/vmlinux.lds.h>	1	#include <asm-generic/vmlinux.lds.h>
		2	#include <asm/page.h>
2		3
3	OUTPUT_FORMAT("elf64-alpha")	4	OUTPUT_FORMAT("elf64-alpha")
4	OUTPUT_ARCH(alpha)	5	OUTPUT_ARCH(alpha)
@@ -8,138 +9,145 @@ jiffies = jiffies_64;
8	SECTIONS	9	SECTIONS
9	{	10	{
10	#ifdef CONFIG_ALPHA_LEGACY_START_ADDRESS	11	#ifdef CONFIG_ALPHA_LEGACY_START_ADDRESS
11	. = 0xfffffc0000310000;	12	. = 0xfffffc0000310000;
12	#else	13	#else
13	. = 0xfffffc0001010000;	14	. = 0xfffffc0001010000;
14	#endif	15	#endif
15		16
16	_text = .; /* Text and read-only data */	17	_text = .; /* Text and read-only data */
17	.text : {	18	.text : {
18	*(.text.head)	19	*(.text.head)
19	TEXT_TEXT	20	TEXT_TEXT
20	SCHED_TEXT	21	SCHED_TEXT
21	LOCK_TEXT	22	LOCK_TEXT
22	*(.fixup)	23	*(.fixup)
23	*(.gnu.warning)	24	*(.gnu.warning)
24	} :kernel	25	} :kernel
25	_etext = .; /* End of text section */	26	_etext = .; /* End of text section */
26		27
27	. = ALIGN(16);	28	/* Exception table */
28	__start___ex_table = .; /* Exception table */	29	. = ALIGN(16);
29	__ex_table : { *(__ex_table) }	30	__ex_table : {
30	__stop___ex_table = .;	31	__start___ex_table = .;
31		32	*(__ex_table)
32	NOTES :kernel :note	33	__stop___ex_table = .;
33	.dummy : { *(.dummy) } :kernel	34	}
34		35
35	RODATA	36	NOTES :kernel :note
36		37	.dummy : {
37	/* Will be freed after init */	38	*(.dummy)
38	. = ALIGN(8192); /* Init code and data */	39	} :kernel
39	__init_begin = .;	40
40	.init.text : {	41	RODATA
41	_sinittext = .;	42
42	*(.init.text)	43	/* Will be freed after init */
43	_einittext = .;	44	. = ALIGN(PAGE_SIZE);
44	}	45	/* Init code and data */
45	.init.data : { *(.init.data) }	46	__init_begin = .;
46		47	.init.text : {
47	. = ALIGN(16);	48	_sinittext = .;
48	__setup_start = .;	49	*(.init.text)
49	.init.setup : { *(.init.setup) }	50	_einittext = .;
50	__setup_end = .;	51	}
51		52	.init.data : {
52	. = ALIGN(8);	53	*(.init.data)
53	__initcall_start = .;	54	}
54	.initcall.init : {	55
55	INITCALLS	56	. = ALIGN(16);
56	}	57	.init.setup : {
57	__initcall_end = .;	58	__setup_start = .;
		59	*(.init.setup)
		60	__setup_end = .;
		61	}
		62
		63	. = ALIGN(8);
		64	.initcall.init : {
		65	__initcall_start = .;
		66	INITCALLS
		67	__initcall_end = .;
		68	}
58		69
59	#ifdef CONFIG_BLK_DEV_INITRD	70	#ifdef CONFIG_BLK_DEV_INITRD
60	. = ALIGN(8192);	71	. = ALIGN(PAGE_SIZE);
61	__initramfs_start = .;	72	.init.ramfs : {
62	.init.ramfs : { *(.init.ramfs) }	73	__initramfs_start = .;
63	__initramfs_end = .;	74	*(.init.ramfs)
		75	__initramfs_end = .;
		76	}
64	#endif	77	#endif
65		78
66	. = ALIGN(8);	79	. = ALIGN(8);
67	.con_initcall.init : {	80	.con_initcall.init : {
68	__con_initcall_start = .;	81	__con_initcall_start = .;
69	*(.con_initcall.init)	82	*(.con_initcall.init)
70	__con_initcall_end = .;	83	__con_initcall_end = .;
71	}	84	}
72		85
73	. = ALIGN(8);	86	. = ALIGN(8);
74	SECURITY_INIT	87	SECURITY_INIT
75		88
76	PERCPU(8192)	89	PERCPU(PAGE_SIZE)
77		90
78	. = ALIGN(2*8192);	91	. = ALIGN(2 * PAGE_SIZE);
79	__init_end = .;	92	__init_end = .;
80	/* Freed after init ends here */	93	/* Freed after init ends here */
81		94
82	/* Note 2 page alignment above. */	95	/* Note 2 page alignment above. */
83	.data.init_thread : { *(.data.init_thread) }	96	.data.init_thread : {
84		97	*(.data.init_thread)
85	. = ALIGN(8192);	98	}
86	.data.page_aligned : { *(.data.page_aligned) }	99
87		100	. = ALIGN(PAGE_SIZE);
88	. = ALIGN(64);	101	.data.page_aligned : {
89	.data.cacheline_aligned : { *(.data.cacheline_aligned) }	102	*(.data.page_aligned)
90		103	}
91	_data = .;	104
92	.data : { /* Data */	105	. = ALIGN(64);
93	DATA_DATA	106	.data.cacheline_aligned : {
94	CONSTRUCTORS	107	*(.data.cacheline_aligned)
95	}	108	}
96		109
97	.got : { *(.got) }	110	_data = .;
98	.sdata : { *(.sdata) }	111	/* Data */
99		112	.data : {
100	_edata = .; /* End of data section */	113	DATA_DATA
101		114	CONSTRUCTORS
102	__bss_start = .;	115	}
103	.sbss : { (.sbss) (.scommon) }	116
104	.bss : { (.bss) (COMMON) }	117	.got : {
105	__bss_stop = .;	118	*(.got)
106		119	}
107	_end = .;	120	.sdata : {
108		121	*(.sdata)
109	/* Sections to be discarded */	122	}
110	/DISCARD/ : { (.exit.text) (.exit.data) *(.exitcall.exit) }	123	_edata = .; /* End of data section */
111		124
112	.mdebug 0 : { *(.mdebug) }	125	__bss_start = .;
113	.note 0 : { *(.note) }	126	.sbss : {
114	.comment 0 : { *(.comment) }	127	*(.sbss)
115		128	*(.scommon)
116	/* Stabs debugging sections */	129	}
117	.stab 0 : { *(.stab) }	130	.bss : {
118	.stabstr 0 : { *(.stabstr) }	131	*(.bss)
119	.stab.excl 0 : { *(.stab.excl) }	132	*(COMMON)
120	.stab.exclstr 0 : { *(.stab.exclstr) }	133	}
121	.stab.index 0 : { *(.stab.index) }	134	__bss_stop = .;
122	.stab.indexstr 0 : { *(.stab.indexstr) }	135	_end = .;
123	/* DWARF 1 */	136
124	.debug 0 : { *(.debug) }	137	/* Sections to be discarded */
125	.line 0 : { *(.line) }	138	/DISCARD/ : {
126	/* GNU DWARF 1 extensions */	139	*(.exit.text)
127	.debug_srcinfo 0 : { *(.debug_srcinfo) }	140	*(.exit.data)
128	.debug_sfnames 0 : { *(.debug_sfnames) }	141	*(.exitcall.exit)
129	/* DWARF 1.1 and DWARF 2 */	142	}
130	.debug_aranges 0 : { *(.debug_aranges) }	143
131	.debug_pubnames 0 : { *(.debug_pubnames) }	144	.mdebug 0 : {
132	/* DWARF 2 */	145	*(.mdebug)
133	.debug_info 0 : { *(.debug_info) }	146	}
134	.debug_abbrev 0 : { *(.debug_abbrev) }	147	.note 0 : {
135	.debug_line 0 : { *(.debug_line) }	148	*(.note)
136	.debug_frame 0 : { *(.debug_frame) }	149	}
137	.debug_str 0 : { *(.debug_str) }	150
138	.debug_loc 0 : { *(.debug_loc) }	151	STABS_DEBUG
139	.debug_macinfo 0 : { *(.debug_macinfo) }	152	DWARF_DEBUG
140	/* SGI/MIPS DWARF 2 extensions */
141	.debug_weaknames 0 : { *(.debug_weaknames) }
142	.debug_funcnames 0 : { *(.debug_funcnames) }
143	.debug_typenames 0 : { *(.debug_typenames) }
144	.debug_varnames 0 : { *(.debug_varnames) }
145	}	153	}


diff --git a/include/asm-alpha/page.h b/include/asm-alpha/page.h index bae7f05716d4..8cc97bfd3789 100644 --- a/include/asm-alpha/page.h +++ b/include/asm-alpha/page.h
@@ -3,11 +3,12 @@
3		3
4	#ifdef __KERNEL__	4	#ifdef __KERNEL__
5		5
		6	#include <linux/const.h>
6	#include <asm/pal.h>	7	#include <asm/pal.h>
7		8
8	/* PAGE_SHIFT determines the page size */	9	/* PAGE_SHIFT determines the page size */
9	#define PAGE_SHIFT 13	10	#define PAGE_SHIFT 13
10	#define PAGE_SIZE (1UL << PAGE_SHIFT)	11	#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)
11	#define PAGE_MASK (~(PAGE_SIZE-1))	12	#define PAGE_MASK (~(PAGE_SIZE-1))
12		13
13	#ifndef __ASSEMBLY__	14	#ifndef __ASSEMBLY__