diff options
| author | Ingo Molnar <[email protected]> | 2008-08-14 10:55:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2008-08-14 10:55:26 +0200 |
| commit | d4439087d316613548c70472291bf4ca646ce24b (patch) | |
| tree | 4819f39cbbfcc2ed9c9f85c7a91cbf142f5b02d4 /arch/arm/mach-shark/include/mach/system.h | |
| parent | 26d809af6397ce5c37f5c44d89734d19cce1ad25 (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
Merge commit 'v2.6.27-rc3' into x86/xsave
Conflicts:
arch/x86/kernel/genapic_64.c
include/asm-x86/kvm_host.h
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'arch/arm/mach-shark/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-shark/include/mach/system.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/arch/arm/mach-shark/include/mach/system.h b/arch/arm/mach-shark/include/mach/system.h new file mode 100644 index 000000000000..85aceef6f874 --- /dev/null +++ b/arch/arm/mach-shark/include/mach/system.h @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-shark/include/mach/system.h + * + * by Alexander Schulz + */ +#ifndef __ASM_ARCH_SYSTEM_H +#define __ASM_ARCH_SYSTEM_H + +#include <asm/io.h> + +static void arch_reset(char mode) +{ + short temp; + local_irq_disable(); + /* Reset the Machine via pc[3] of the sequoia chipset */ + outw(0x09,0x24); + temp=inw(0x26); + temp = temp | (1<<3) | (1<<10); + outw(0x09,0x24); + outw(temp,0x26); + +} + +static inline void arch_idle(void) +{ +} + +#endif |