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
5dd0c5ab
Commit
5dd0c5ab
authored
Jan 23, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://linux-voyager.bkbits.net/voyager-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents
03ad5fa2
b0c980fa
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
9 deletions
+2
-9
arch/i386/kernel/pci-dma.c
arch/i386/kernel/pci-dma.c
+1
-0
arch/i386/kernel/reboot.c
arch/i386/kernel/reboot.c
+1
-1
arch/i386/mach-visws/reboot.c
arch/i386/mach-visws/reboot.c
+0
-3
arch/i386/mach-voyager/voyager_basic.c
arch/i386/mach-voyager/voyager_basic.c
+0
-2
arch/i386/mach-voyager/voyager_smp.c
arch/i386/mach-voyager/voyager_smp.c
+0
-3
No files found.
arch/i386/kernel/pci-dma.c
View file @
5dd0c5ab
...
...
@@ -122,6 +122,7 @@ void dma_release_declared_memory(struct device *dev)
if
(
!
mem
)
return
;
dev
->
dma_mem
=
NULL
;
iounmap
(
mem
->
virt_base
);
kfree
(
mem
->
bitmap
);
kfree
(
mem
);
}
...
...
arch/i386/kernel/reboot.c
View file @
5dd0c5ab
...
...
@@ -20,7 +20,7 @@
void
(
*
pm_power_off
)(
void
);
static
int
reboot_mode
;
int
reboot_thru_bios
;
static
int
reboot_thru_bios
;
#ifdef CONFIG_SMP
int
reboot_smp
=
0
;
...
...
arch/i386/mach-visws/reboot.c
View file @
5dd0c5ab
...
...
@@ -8,9 +8,6 @@
void
(
*
pm_power_off
)(
void
);
int
reboot_thru_bios
;
int
reboot_smp
;
void
machine_restart
(
char
*
__unused
)
{
#ifdef CONFIG_SMP
...
...
arch/i386/mach-voyager/voyager_basic.c
View file @
5dd0c5ab
...
...
@@ -36,8 +36,6 @@
*/
void
(
*
pm_power_off
)(
void
);
int
reboot_thru_bios
;
int
voyager_level
=
0
;
struct
voyager_SUS
*
voyager_SUS
=
NULL
;
...
...
arch/i386/mach-voyager/voyager_smp.c
View file @
5dd0c5ab
...
...
@@ -27,13 +27,10 @@
#include <asm/mtrr.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/desc.h>
#include <asm/arch_hooks.h>
#include <linux/irq.h>
int
reboot_smp
=
0
;
/* TLB state -- visible externally, indexed physically */
DEFINE_PER_CPU
(
struct
tlb_state
,
cpu_tlbstate
)
____cacheline_aligned
=
{
&
init_mm
,
0
};
...
...
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