Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
bef9ae3d
Commit
bef9ae3d
authored
Dec 28, 2012
by
Ralf Baechle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MIPS: Switch remaining assembler PAGE_SIZE users to <asm/asm-offsets.h>.
Signed-off-by:
Ralf Baechle
<
ralf@linux-mips.org
>
parent
20082595
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
8 deletions
+6
-8
arch/mips/kernel/genex.S
arch/mips/kernel/genex.S
+2
-3
arch/mips/kernel/relocate_kernel.S
arch/mips/kernel/relocate_kernel.S
+1
-2
arch/mips/kernel/vmlinux.lds.S
arch/mips/kernel/vmlinux.lds.S
+2
-1
arch/mips/power/hibernate.S
arch/mips/power/hibernate.S
+1
-2
No files found.
arch/mips/kernel/genex.S
View file @
bef9ae3d
...
@@ -19,7 +19,6 @@
...
@@ -19,7 +19,6 @@
#include <asm/mipsregs.h>
#include <asm/mipsregs.h>
#include <asm/stackframe.h>
#include <asm/stackframe.h>
#include <asm/war.h>
#include <asm/war.h>
#include <asm/page.h>
#include <asm/thread_info.h>
#include <asm/thread_info.h>
#define PANIC_PIC(msg) \
#define PANIC_PIC(msg) \
...
@@ -483,8 +482,8 @@ NESTED(nmi_handler, PT_SIZE, sp)
...
@@ -483,8 +482,8 @@ NESTED(nmi_handler, PT_SIZE, sp)
MFC0
k1
,
CP0_ENTRYHI
MFC0
k1
,
CP0_ENTRYHI
andi
k1
,
0xff
/*
ASID_MASK
*/
andi
k1
,
0xff
/*
ASID_MASK
*/
MFC0
k0
,
CP0_EPC
MFC0
k0
,
CP0_EPC
PTR_SRL
k0
,
PAGE_SHIFT
+
1
PTR_SRL
k0
,
_
PAGE_SHIFT
+
1
PTR_SLL
k0
,
PAGE_SHIFT
+
1
PTR_SLL
k0
,
_
PAGE_SHIFT
+
1
or
k1
,
k0
or
k1
,
k0
MTC0
k1
,
CP0_ENTRYHI
MTC0
k1
,
CP0_ENTRYHI
mtc0_tlbw_hazard
mtc0_tlbw_hazard
...
...
arch/mips/kernel/relocate_kernel.S
View file @
bef9ae3d
...
@@ -9,7 +9,6 @@
...
@@ -9,7 +9,6 @@
#include <asm/asm.h>
#include <asm/asm.h>
#include <asm/asmmacro.h>
#include <asm/asmmacro.h>
#include <asm/regdef.h>
#include <asm/regdef.h>
#include <asm/page.h>
#include <asm/mipsregs.h>
#include <asm/mipsregs.h>
#include <asm/stackframe.h>
#include <asm/stackframe.h>
#include <asm/addrspace.h>
#include <asm/addrspace.h>
...
@@ -50,7 +49,7 @@ process_entry:
...
@@ -50,7 +49,7 @@ process_entry:
and
s3
,
s2
,
0x8
and
s3
,
s2
,
0x8
beq
s3
,
zero
,
process_entry
beq
s3
,
zero
,
process_entry
and
s2
,
s2
,
~
0x8
and
s2
,
s2
,
~
0x8
li
s6
,
(
1
<<
PAGE_SHIFT
)
/
SZREG
li
s6
,
(
1
<<
_
PAGE_SHIFT
)
/
SZREG
copy_word
:
copy_word
:
/
*
copy
page
word
by
word
*/
/
*
copy
page
word
by
word
*/
...
...
arch/mips/kernel/vmlinux.lds.S
View file @
bef9ae3d
#include <asm/asm-offsets.h>
#include <asm/asm-offsets.h>
#include <asm/page.h>
#include <asm/thread_info.h>
#include <asm/thread_info.h>
#define PAGE_SIZE _PAGE_SIZE
/*
/*
*
Put
.
bss
..
swapper_pg_dir
as
the
first
thing
in
.
bss
.
This
will
*
Put
.
bss
..
swapper_pg_dir
as
the
first
thing
in
.
bss
.
This
will
*
ensure
that
it
has
.
bss
alignment
(
64
K
)
.
*
ensure
that
it
has
.
bss
alignment
(
64
K
)
.
...
...
arch/mips/power/hibernate.S
View file @
bef9ae3d
...
@@ -8,7 +8,6 @@
...
@@ -8,7 +8,6 @@
*
Wu
Zhangjin
<
wuzhangjin
@
gmail
.
com
>
*
Wu
Zhangjin
<
wuzhangjin
@
gmail
.
com
>
*/
*/
#include <asm/asm-offsets.h>
#include <asm/asm-offsets.h>
#include <asm/page.h>
#include <asm/regdef.h>
#include <asm/regdef.h>
#include <asm/asm.h>
#include <asm/asm.h>
...
@@ -35,7 +34,7 @@ LEAF(swsusp_arch_resume)
...
@@ -35,7 +34,7 @@ LEAF(swsusp_arch_resume)
0
:
0
:
PTR_L
t1
,
PBE_ADDRESS
(
t0
)
/*
source
*/
PTR_L
t1
,
PBE_ADDRESS
(
t0
)
/*
source
*/
PTR_L
t2
,
PBE_ORIG_ADDRESS
(
t0
)
/*
destination
*/
PTR_L
t2
,
PBE_ORIG_ADDRESS
(
t0
)
/*
destination
*/
PTR_ADDU
t3
,
t1
,
PAGE_SIZE
PTR_ADDU
t3
,
t1
,
_
PAGE_SIZE
1
:
1
:
REG_L
t8
,
(
t1
)
REG_L
t8
,
(
t1
)
REG_S
t8
,
(
t2
)
REG_S
t8
,
(
t2
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment