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
47dabdc7
Commit
47dabdc7
authored
Jan 02, 2009
by
Ingo Molnar
Browse files
Options
Browse Files
Download
Plain Diff
Merge branches 'x86/cleanups', 'x86/fpu' and 'x86/urgent' into x86/core
parents
923a789b
46814dde
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
10 deletions
+1
-10
arch/x86/kernel/head64.c
arch/x86/kernel/head64.c
+1
-1
arch/x86/kernel/tlb_uv.c
arch/x86/kernel/tlb_uv.c
+0
-9
No files found.
arch/x86/kernel/head64.c
View file @
47dabdc7
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
#include <asm/trampoline.h>
#include <asm/trampoline.h>
/* boot cpu pda */
/* boot cpu pda */
static
struct
x8664_pda
_boot_cpu_pda
__read_mostly
;
static
struct
x8664_pda
_boot_cpu_pda
;
#ifdef CONFIG_SMP
#ifdef CONFIG_SMP
/*
/*
...
...
arch/x86/kernel/tlb_uv.c
View file @
47dabdc7
...
@@ -582,7 +582,6 @@ static int __init uv_ptc_init(void)
...
@@ -582,7 +582,6 @@ static int __init uv_ptc_init(void)
static
struct
bau_control
*
__init
uv_table_bases_init
(
int
blade
,
int
node
)
static
struct
bau_control
*
__init
uv_table_bases_init
(
int
blade
,
int
node
)
{
{
int
i
;
int
i
;
int
*
ip
;
struct
bau_msg_status
*
msp
;
struct
bau_msg_status
*
msp
;
struct
bau_control
*
bau_tabp
;
struct
bau_control
*
bau_tabp
;
...
@@ -599,13 +598,6 @@ static struct bau_control * __init uv_table_bases_init(int blade, int node)
...
@@ -599,13 +598,6 @@ static struct bau_control * __init uv_table_bases_init(int blade, int node)
bau_cpubits_clear
(
&
msp
->
seen_by
,
(
int
)
bau_cpubits_clear
(
&
msp
->
seen_by
,
(
int
)
uv_blade_nr_possible_cpus
(
blade
));
uv_blade_nr_possible_cpus
(
blade
));
bau_tabp
->
watching
=
kmalloc_node
(
sizeof
(
int
)
*
DEST_NUM_RESOURCES
,
GFP_KERNEL
,
node
);
BUG_ON
(
!
bau_tabp
->
watching
);
for
(
i
=
0
,
ip
=
bau_tabp
->
watching
;
i
<
DEST_Q_SIZE
;
i
++
,
ip
++
)
*
ip
=
0
;
uv_bau_table_bases
[
blade
]
=
bau_tabp
;
uv_bau_table_bases
[
blade
]
=
bau_tabp
;
return
bau_tabp
;
return
bau_tabp
;
...
@@ -628,7 +620,6 @@ uv_table_bases_finish(int blade, int node, int cur_cpu,
...
@@ -628,7 +620,6 @@ uv_table_bases_finish(int blade, int node, int cur_cpu,
bcp
->
bau_msg_head
=
bau_tablesp
->
va_queue_first
;
bcp
->
bau_msg_head
=
bau_tablesp
->
va_queue_first
;
bcp
->
va_queue_first
=
bau_tablesp
->
va_queue_first
;
bcp
->
va_queue_first
=
bau_tablesp
->
va_queue_first
;
bcp
->
va_queue_last
=
bau_tablesp
->
va_queue_last
;
bcp
->
va_queue_last
=
bau_tablesp
->
va_queue_last
;
bcp
->
watching
=
bau_tablesp
->
watching
;
bcp
->
msg_statuses
=
bau_tablesp
->
msg_statuses
;
bcp
->
msg_statuses
=
bau_tablesp
->
msg_statuses
;
bcp
->
descriptor_base
=
adp
;
bcp
->
descriptor_base
=
adp
;
}
}
...
...
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