Commit 5dd0c5ab authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://linux-voyager.bkbits.net/voyager-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 03ad5fa2 b0c980fa
......@@ -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);
}
......
......@@ -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;
......
......@@ -8,9 +8,6 @@
void (*pm_power_off)(void);
int reboot_thru_bios;
int reboot_smp;
void machine_restart(char * __unused)
{
#ifdef CONFIG_SMP
......
......@@ -36,8 +36,6 @@
*/
void (*pm_power_off)(void);
int reboot_thru_bios;
int voyager_level = 0;
struct voyager_SUS *voyager_SUS = NULL;
......
......@@ -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 };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment