aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/parisc/hpux/gate.S4
-rw-r--r--arch/parisc/kernel/entry.S4
-rw-r--r--arch/parisc/kernel/hpmc.S4
-rw-r--r--arch/parisc/kernel/init_task.c2
-rw-r--r--arch/parisc/kernel/syscall.S2
5 files changed, 8 insertions, 8 deletions
diff --git a/arch/parisc/hpux/gate.S b/arch/parisc/hpux/gate.S
index 0b9d5b1e4b37..38a1c1b8d4e8 100644
--- a/arch/parisc/hpux/gate.S
+++ b/arch/parisc/hpux/gate.S
@@ -20,7 +20,7 @@
20 .import hpux_call_table 20 .import hpux_call_table
21 .import hpux_syscall_exit,code 21 .import hpux_syscall_exit,code
22 22
23 .align 4096 23 .align PAGE_SIZE
24ENTRY(hpux_gateway_page) 24ENTRY(hpux_gateway_page)
25 nop 25 nop
26#ifdef CONFIG_64BIT 26#ifdef CONFIG_64BIT
@@ -103,5 +103,5 @@ syscall_nosys:
103 ldo -ENOSYS(%r0),%r28 103 ldo -ENOSYS(%r0),%r28
104ENDPROC(hpux_gateway_page) 104ENDPROC(hpux_gateway_page)
105 105
106 .align 4096 106 .align PAGE_SIZE
107ENTRY(end_hpux_gateway_page) 107ENTRY(end_hpux_gateway_page)
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index 42598abf4576..f324939bb9af 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -652,7 +652,7 @@
652 652
653 .text 653 .text
654 654
655 .align 4096 655 .align PAGE_SIZE
656 656
657ENTRY(fault_vector_20) 657ENTRY(fault_vector_20)
658 /* First vector is invalid (0) */ 658 /* First vector is invalid (0) */
@@ -904,7 +904,7 @@ ENDPROC(_switch_to)
904 * 904 *
905 */ 905 */
906 906
907 .align 4096 907 .align PAGE_SIZE
908 908
909ENTRY(syscall_exit_rfi) 909ENTRY(syscall_exit_rfi)
910 mfctl %cr30,%r16 910 mfctl %cr30,%r16
diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
index 43b41df0b541..2cbf13b3ef11 100644
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
@@ -55,13 +55,13 @@
55 * IODC requires 7K byte stack. That leaves 1K byte for os_hpmc. 55 * IODC requires 7K byte stack. That leaves 1K byte for os_hpmc.
56 */ 56 */
57 57
58 .align 4096 58 .align PAGE_SIZE
59hpmc_stack: 59hpmc_stack:
60 .block 16384 60 .block 16384
61 61
62#define HPMC_IODC_BUF_SIZE 0x8000 62#define HPMC_IODC_BUF_SIZE 0x8000
63 63
64 .align 4096 64 .align PAGE_SIZE
65hpmc_iodc_buf: 65hpmc_iodc_buf:
66 .block HPMC_IODC_BUF_SIZE 66 .block HPMC_IODC_BUF_SIZE
67 67
diff --git a/arch/parisc/kernel/init_task.c b/arch/parisc/kernel/init_task.c
index 446f98d3fd7b..3b2f7d395bde 100644
--- a/arch/parisc/kernel/init_task.c
+++ b/arch/parisc/kernel/init_task.c
@@ -49,7 +49,7 @@ EXPORT_SYMBOL(init_mm);
49 * way process stacks are handled. This is done by having a special 49 * way process stacks are handled. This is done by having a special
50 * "init_task" linker map entry.. 50 * "init_task" linker map entry..
51 */ 51 */
52unsigned char interrupt_stack[ISTACK_SIZE] __attribute__ ((section("init_istack"), aligned(4096))); 52unsigned char interrupt_stack[ISTACK_SIZE] __attribute__ ((section("init_istack"), aligned(PAGE_SIZE)));
53union thread_union init_thread_union 53union thread_union init_thread_union
54 __attribute__((aligned(128))) __attribute__((__section__(".data.init_task"))) = 54 __attribute__((aligned(128))) __attribute__((__section__(".data.init_task"))) =
55 { INIT_THREAD_INFO(init_task) }; 55 { INIT_THREAD_INFO(init_task) };
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index 06cde9e700e9..69b6eebc466e 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -637,7 +637,7 @@ END(sys_call_table64)
637 will use this set of locks 637 will use this set of locks
638 */ 638 */
639 .section .data 639 .section .data
640 .align 4096 640 .align PAGE_SIZE
641ENTRY(lws_lock_start) 641ENTRY(lws_lock_start)
642 /* lws locks */ 642 /* lws locks */
643 .align 16 643 .align 16