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
1c20618e
Commit
1c20618e
authored
Sep 21, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/davem/sparc-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
parents
a442806d
28a692a8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
15 deletions
+5
-15
arch/sparc/kernel/sun4d_smp.c
arch/sparc/kernel/sun4d_smp.c
+5
-5
arch/sparc/mm/srmmu.c
arch/sparc/mm/srmmu.c
+0
-7
drivers/sbus/char/bpp.c
drivers/sbus/char/bpp.c
+0
-1
drivers/sbus/char/cpwatchdog.c
drivers/sbus/char/cpwatchdog.c
+0
-1
drivers/sbus/char/display7seg.c
drivers/sbus/char/display7seg.c
+0
-1
No files found.
arch/sparc/kernel/sun4d_smp.c
View file @
1c20618e
...
...
@@ -343,11 +343,11 @@ void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2,
unsigned
long
a3
asm
(
"i3"
)
=
arg3
;
unsigned
long
a4
asm
(
"i4"
)
=
arg4
;
unsigned
long
a5
asm
(
"i5"
)
=
arg5
;
__asm__
__volatile__
(
"
std %0, [%6]
std %2, [%6 + 8]
std %4, [%6 + 16]"
:
:
__asm__
__volatile__
(
"std %0, [%6]
\n\t
"
"std %2, [%6 + 8]
\n\t
"
"std %4, [%6 + 16]
\n\t
"
:
:
"r"
(
f
),
"r"
(
a1
),
"r"
(
a2
),
"r"
(
a3
),
"r"
(
a4
),
"r"
(
a5
),
"r"
(
&
ccall_info
.
func
));
}
...
...
arch/sparc/mm/srmmu.c
View file @
1c20618e
...
...
@@ -330,9 +330,6 @@ static unsigned long __srmmu_get_nocache(int size, int align)
offset
=
bit_map_string_get
(
&
srmmu_nocache_map
,
size
>>
SRMMU_NOCACHE_BITMAP_SHIFT
,
align
>>
SRMMU_NOCACHE_BITMAP_SHIFT
);
/* P3 */
/* printk("srmmu: get size %d align %d, got %d (0x%x)\n",
size >> SRMMU_NOCACHE_BITMAP_SHIFT, align >> SRMMU_NOCACHE_BITMAP_SHIFT,
offset, offset); */
if
(
offset
==
-
1
)
{
printk
(
"srmmu: out of nocache %d: %d/%d
\n
"
,
size
,
(
int
)
srmmu_nocache_size
,
...
...
@@ -385,7 +382,6 @@ void srmmu_free_nocache(unsigned long vaddr, int size)
offset
=
(
vaddr
-
SRMMU_NOCACHE_VADDR
)
>>
SRMMU_NOCACHE_BITMAP_SHIFT
;
size
=
size
>>
SRMMU_NOCACHE_BITMAP_SHIFT
;
/* P3 */
/* printk("srmmu: free off %d (0x%x) size %d\n", offset, offset, size); */
bit_map_clear
(
&
srmmu_nocache_map
,
offset
,
size
);
}
...
...
@@ -447,9 +443,6 @@ void srmmu_nocache_init(void)
paddr
=
__pa
((
unsigned
long
)
srmmu_nocache_pool
);
vaddr
=
SRMMU_NOCACHE_VADDR
;
/* P3 */
printk
(
"srmmu: pool 0x%x vaddr 0x%x bitmap 0x%x bits %d (0x%x)
\n
"
,
(
int
)
srmmu_nocache_pool
,
vaddr
,
srmmu_nocache_bitmap
,
bitmap_bits
,
bitmap_bits
);
while
(
vaddr
<
srmmu_nocache_end
)
{
pgd
=
pgd_offset_k
(
vaddr
);
pmd
=
srmmu_pmd_offset
(
__nocache_fix
(
pgd
),
vaddr
);
...
...
drivers/sbus/char/bpp.c
View file @
1c20618e
...
...
@@ -12,7 +12,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/fs.h>
#include <linux/errno.h>
#include <linux/sched.h>
...
...
drivers/sbus/char/cpwatchdog.c
View file @
1c20618e
...
...
@@ -17,7 +17,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/fs.h>
#include <linux/errno.h>
#include <linux/major.h>
...
...
drivers/sbus/char/display7seg.c
View file @
1c20618e
...
...
@@ -9,7 +9,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/fs.h>
#include <linux/errno.h>
#include <linux/major.h>
...
...
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