Commit 37deafa7 authored by Anton Blanchard's avatar Anton Blanchard

Merge samba.org:/scratch/anton/linux-2.5

into samba.org:/scratch/anton/for-alan
parents 9552d6bc b1d56a42
...@@ -106,9 +106,8 @@ _GLOBAL(DoSyscall) ...@@ -106,9 +106,8 @@ _GLOBAL(DoSyscall)
beq- 15f beq- 15f
ld r10,.SYS_CALL_TABLE32@toc(2) ld r10,.SYS_CALL_TABLE32@toc(2)
/* /*
* Now mung the first 4 parameters into shape, by making certain that * We now zero extend all six arguments (r3 - r8), the compatibility
* the high bits (most significant 32 bits in 64 bit reg) are 0 * layer assumes this.
* for the first 4 parameter regs(3-6).
*/ */
clrldi r3,r3,32 clrldi r3,r3,32
clrldi r4,r4,32 clrldi r4,r4,32
...@@ -178,9 +177,8 @@ _GLOBAL(ret_from_syscall_1) ...@@ -178,9 +177,8 @@ _GLOBAL(ret_from_syscall_1)
beq- 55f beq- 55f
ld r10,.SYS_CALL_TABLE32@toc(2) ld r10,.SYS_CALL_TABLE32@toc(2)
/* /*
* Now mung the first 4 parameters into shape, by making certain that * We now zero extend all six arguments (r3 - r8), the compatibility
* the high bits (most significant 32 bits in 64 bit reg) are 0 * layer assumes this.
* for the first 4 parameter regs(3-6).
*/ */
clrldi r3,r3,32 clrldi r3,r3,32
clrldi r4,r4,32 clrldi r4,r4,32
......
#ifndef _PPC64_BUG_H
#define _PPC64_BUG_H
#include <linux/config.h>
#ifdef CONFIG_XMON
struct pt_regs;
extern void xmon(struct pt_regs *excp);
#define BUG() do { \
printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
xmon(0); \
} while (0)
#else
#define BUG() do { \
printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
__asm__ __volatile__(".long " BUG_ILLEGAL_INSTR); \
} while (0)
#endif
#define PAGE_BUG(page) do { BUG(); } while (0)
#endif
...@@ -103,22 +103,6 @@ typedef unsigned long pgprot_t; ...@@ -103,22 +103,6 @@ typedef unsigned long pgprot_t;
#endif #endif
#ifdef CONFIG_XMON
#include <asm/ptrace.h>
extern void xmon(struct pt_regs *excp);
#define BUG() do { \
printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
xmon(0); \
} while (0)
#else
#define BUG() do { \
printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
__asm__ __volatile__(".long " BUG_ILLEGAL_INSTR); \
} while (0)
#endif
#define PAGE_BUG(page) do { BUG(); } while (0)
/* Pure 2^n version of get_order */ /* Pure 2^n version of get_order */
static inline int get_order(unsigned long size) static inline int get_order(unsigned long size)
{ {
......
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