aboutsummaryrefslogtreecommitdiffstats
path: root/arch/frv
diff options
context:
space:
mode:
Diffstat (limited to 'arch/frv')
-rw-r--r--arch/frv/include/asm/pci.h2
-rw-r--r--arch/frv/include/asm/spr-regs.h2
-rw-r--r--arch/frv/include/asm/virtconvert.h2
-rw-r--r--arch/frv/kernel/entry-table.S4
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/frv/include/asm/pci.h b/arch/frv/include/asm/pci.h
index 0d5997909850..ef03baf5d89d 100644
--- a/arch/frv/include/asm/pci.h
+++ b/arch/frv/include/asm/pci.h
@@ -54,7 +54,7 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
54#endif 54#endif
55 55
56/* 56/*
57 * These are pretty much arbitary with the CoMEM implementation. 57 * These are pretty much arbitrary with the CoMEM implementation.
58 * We have the whole address space to ourselves. 58 * We have the whole address space to ourselves.
59 */ 59 */
60#define PCIBIOS_MIN_IO 0x100 60#define PCIBIOS_MIN_IO 0x100
diff --git a/arch/frv/include/asm/spr-regs.h b/arch/frv/include/asm/spr-regs.h
index 01e6af5e99b8..d3883021f236 100644
--- a/arch/frv/include/asm/spr-regs.h
+++ b/arch/frv/include/asm/spr-regs.h
@@ -274,7 +274,7 @@
274#define MSR0_RD 0xc0000000 /* rounding mode */ 274#define MSR0_RD 0xc0000000 /* rounding mode */
275#define MSR0_RD_NEAREST 0x00000000 /* - nearest */ 275#define MSR0_RD_NEAREST 0x00000000 /* - nearest */
276#define MSR0_RD_ZERO 0x40000000 /* - zero */ 276#define MSR0_RD_ZERO 0x40000000 /* - zero */
277#define MSR0_RD_POS_INF 0x80000000 /* - postive infinity */ 277#define MSR0_RD_POS_INF 0x80000000 /* - positive infinity */
278#define MSR0_RD_NEG_INF 0xc0000000 /* - negative infinity */ 278#define MSR0_RD_NEG_INF 0xc0000000 /* - negative infinity */
279 279
280/* 280/*
diff --git a/arch/frv/include/asm/virtconvert.h b/arch/frv/include/asm/virtconvert.h
index 59788fa2a813..b26d70ab9111 100644
--- a/arch/frv/include/asm/virtconvert.h
+++ b/arch/frv/include/asm/virtconvert.h
@@ -1,4 +1,4 @@
1/* virtconvert.h: virtual/physical/page address convertion 1/* virtconvert.h: virtual/physical/page address conversion
2 * 2 *
3 * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. 3 * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
4 * Written by David Howells (dhowells@redhat.com) 4 * Written by David Howells (dhowells@redhat.com)
diff --git a/arch/frv/kernel/entry-table.S b/arch/frv/kernel/entry-table.S
index bf35f33e48c9..06c5ae191e59 100644
--- a/arch/frv/kernel/entry-table.S
+++ b/arch/frv/kernel/entry-table.S
@@ -86,7 +86,7 @@ __break_usertrap_fixup_table:
86 .globl __break_kerneltrap_fixup_table 86 .globl __break_kerneltrap_fixup_table
87__break_kerneltrap_fixup_table: 87__break_kerneltrap_fixup_table:
88 88
89 # handler declaration for a sofware or program interrupt 89 # handler declaration for a software or program interrupt
90.macro VECTOR_SOFTPROG tbr_tt, vec 90.macro VECTOR_SOFTPROG tbr_tt, vec
91 .section .trap.user 91 .section .trap.user
92 .org \tbr_tt 92 .org \tbr_tt
@@ -145,7 +145,7 @@ __break_kerneltrap_fixup_table:
145 .long \vec 145 .long \vec
146.endm 146.endm
147 147
148 # handler declaration for an MMU only sofware or program interrupt 148 # handler declaration for an MMU only software or program interrupt
149.macro VECTOR_SP_MMU tbr_tt, vec 149.macro VECTOR_SP_MMU tbr_tt, vec
150#ifdef CONFIG_MMU 150#ifdef CONFIG_MMU
151 VECTOR_SOFTPROG \tbr_tt, \vec 151 VECTOR_SOFTPROG \tbr_tt, \vec