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
Kirill Smelkov
linux
Commits
70679ee3
Commit
70679ee3
authored
Aug 10, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
parents
435d444a
b876386e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
arch/arm/kernel/entry-armv.S
arch/arm/kernel/entry-armv.S
+7
-0
arch/arm/lib/bitops.h
arch/arm/lib/bitops.h
+3
-1
No files found.
arch/arm/kernel/entry-armv.S
View file @
70679ee3
...
@@ -533,6 +533,13 @@ ENTRY(__switch_to)
...
@@ -533,6 +533,13 @@ ENTRY(__switch_to)
ldr
r3
,
[
r2
,
#
TI_TP_VALUE
]
ldr
r3
,
[
r2
,
#
TI_TP_VALUE
]
stmia
ip
!,
{
r4
-
sl
,
fp
,
sp
,
lr
}
@
Store
most
regs
on
stack
stmia
ip
!,
{
r4
-
sl
,
fp
,
sp
,
lr
}
@
Store
most
regs
on
stack
ldr
r6
,
[
r2
,
#
TI_CPU_DOMAIN
]!
ldr
r6
,
[
r2
,
#
TI_CPU_DOMAIN
]!
#if __LINUX_ARM_ARCH__ >= 6
#ifdef CONFIG_CPU_MPCORE
clrex
#else
strex
r3
,
r4
,
[
ip
]
@
Clear
exclusive
monitor
#endif
#endif
#if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT)
#if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT)
mra
r4
,
r5
,
acc0
mra
r4
,
r5
,
acc0
stmia
ip
,
{
r4
,
r5
}
stmia
ip
,
{
r4
,
r5
}
...
...
arch/arm/lib/bitops.h
View file @
70679ee3
#if __LINUX_ARM_ARCH__ >= 6
#include <linux/config.h>
#if __LINUX_ARM_ARCH__ >= 6 && defined(CONFIG_CPU_MPCORE)
.
macro
bitop
,
instr
.
macro
bitop
,
instr
mov
r2
,
#
1
mov
r2
,
#
1
and
r3
,
r0
,
#
7
@
Get
bit
offset
and
r3
,
r0
,
#
7
@
Get
bit
offset
...
...
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