Commit 1a44cb0b authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/davem/BK/sparc-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 4328527c a094624d
/* /*
* arch/v850/vmlinux.lds.S -- kernel linker script for v850 platforms * arch/v850/vmlinux.lds.S -- kernel linker script for v850 platforms
* *
* Copyright (C) 2002,03 NEC Electronics Corporation * Copyright (C) 2002,03,04 NEC Electronics Corporation
* Copyright (C) 2002,03 Miles Bader <miles@gnu.org> * Copyright (C) 2002,03,04 Miles Bader <miles@gnu.org>
* *
* This file is subject to the terms and conditions of the GNU General * This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this * Public License. See the file COPYING in the main directory of this
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
#define TEXT_CONTENTS \ #define TEXT_CONTENTS \
__stext = . ; \ __stext = . ; \
*(.text) \ *(.text) \
SCHED_TEXT SCHED_TEXT \
*(.exit.text) /* 2.5 convention */ \ *(.exit.text) /* 2.5 convention */ \
*(.text.exit) /* 2.4 convention */ \ *(.text.exit) /* 2.4 convention */ \
*(.text.lock) \ *(.text.lock) \
......
...@@ -193,10 +193,86 @@ extern __inline__ int find_next_zero_bit (void *addr, int size, int offset) ...@@ -193,10 +193,86 @@ extern __inline__ int find_next_zero_bit (void *addr, int size, int offset)
return result + ffz (tmp); return result + ffz (tmp);
} }
/* This is the same as generic_ffs, but we can't use that because it's
inline and the #include order mucks things up. */
static inline int generic_ffs_for_find_next_bit(int x)
{
int r = 1;
if (!x)
return 0;
if (!(x & 0xffff)) {
x >>= 16;
r += 16;
}
if (!(x & 0xff)) {
x >>= 8;
r += 8;
}
if (!(x & 0xf)) {
x >>= 4;
r += 4;
}
if (!(x & 3)) {
x >>= 2;
r += 2;
}
if (!(x & 1)) {
x >>= 1;
r += 1;
}
return r;
}
/*
* Find next one bit in a bitmap reasonably efficiently.
*/
static __inline__ unsigned long find_next_bit(const unsigned long *addr,
unsigned long size, unsigned long offset)
{
unsigned int *p = ((unsigned int *) addr) + (offset >> 5);
unsigned int result = offset & ~31UL;
unsigned int tmp;
if (offset >= size)
return size;
size -= result;
offset &= 31UL;
if (offset) {
tmp = *p++;
tmp &= ~0UL << offset;
if (size < 32)
goto found_first;
if (tmp)
goto found_middle;
size -= 32;
result += 32;
}
while (size >= 32) {
if ((tmp = *p++) != 0)
goto found_middle;
result += 32;
size -= 32;
}
if (!size)
return result;
tmp = *p;
found_first:
tmp &= ~0UL >> (32 - size);
if (tmp == 0UL) /* Are any bits set? */
return result + size; /* Nope. */
found_middle:
return result + generic_ffs_for_find_next_bit(tmp);
}
#define ffs(x) generic_ffs (x) #define ffs(x) generic_ffs (x)
#define fls(x) generic_fls (x) #define fls(x) generic_fls (x)
#define __ffs(x) ffs(x) #define __ffs(x) ffs(x)
/* /*
* This is just `generic_ffs' from <linux/bitops.h>, except that it assumes * This is just `generic_ffs' from <linux/bitops.h>, except that it assumes
* that at least one bit is set, and returns the real index of the bit * that at least one bit is set, and returns the real index of the bit
......
/* /*
* include/asm-v850/irq.h -- Machine interrupt handling * include/asm-v850/irq.h -- Machine interrupt handling
* *
* Copyright (C) 2001,02 NEC Corporation * Copyright (C) 2001,02,04 NEC Electronics Corporation
* Copyright (C) 2001,02 Miles Bader <miles@gnu.org> * Copyright (C) 2001,02,04 Miles Bader <miles@gnu.org>
* *
* This file is subject to the terms and conditions of the GNU General * This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this * Public License. See the file COPYING in the main directory of this
...@@ -62,11 +62,8 @@ extern void disable_irq (unsigned int irq); ...@@ -62,11 +62,8 @@ extern void disable_irq (unsigned int irq);
/* Disable an irq without waiting. */ /* Disable an irq without waiting. */
extern void disable_irq_nosync (unsigned int irq); extern void disable_irq_nosync (unsigned int irq);
extern int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
struct irqaction;
struct pt_regs;
int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
#endif /* __V850_IRQ_H__ */ #endif /* __V850_IRQ_H__ */
/* /*
* include/asm-v850/unistd.h -- System call numbers and invocation mechanism * include/asm-v850/unistd.h -- System call numbers and invocation mechanism
* *
* Copyright (C) 2001,02,03 NEC Electronics Corporation * Copyright (C) 2001,02,03,04 NEC Electronics Corporation
* Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org> * Copyright (C) 2001,02,03,04 Miles Bader <miles@gnu.org>
* *
* This file is subject to the terms and conditions of the GNU General * This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this * Public License. See the file COPYING in the main directory of this
...@@ -389,7 +389,6 @@ type name (atype a, btype b, ctype c, dtype d, etype e, ftype f) \ ...@@ -389,7 +389,6 @@ type name (atype a, btype b, ctype c, dtype d, etype e, ftype f) \
#ifdef __KERNEL__ #ifdef __KERNEL__
#define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_OLD_STAT
#define __ARCH_WANT_STAT64 #define __ARCH_WANT_STAT64
#define __ARCH_WANT_SYS_ALARM #define __ARCH_WANT_SYS_ALARM
#define __ARCH_WANT_SYS_GETHOSTNAME #define __ARCH_WANT_SYS_GETHOSTNAME
...@@ -404,7 +403,6 @@ type name (atype a, btype b, ctype c, dtype d, etype e, ftype f) \ ...@@ -404,7 +403,6 @@ type name (atype a, btype b, ctype c, dtype d, etype e, ftype f) \
#define __ARCH_WANT_SYS_GETPGRP #define __ARCH_WANT_SYS_GETPGRP
#define __ARCH_WANT_SYS_LLSEEK #define __ARCH_WANT_SYS_LLSEEK
#define __ARCH_WANT_SYS_NICE #define __ARCH_WANT_SYS_NICE
#define __ARCH_WANT_SYS_OLD_GETRLIMIT
#define __ARCH_WANT_SYS_OLDUMOUNT #define __ARCH_WANT_SYS_OLDUMOUNT
#define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPENDING
#define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_SIGPROCMASK
......
...@@ -77,6 +77,7 @@ config SWAP ...@@ -77,6 +77,7 @@ config SWAP
config SYSVIPC config SYSVIPC
bool "System V IPC" bool "System V IPC"
depends on MMU
---help--- ---help---
Inter Process Communication is a suite of library functions and Inter Process Communication is a suite of library functions and
system calls which let processes (running programs) synchronize and system calls which let processes (running programs) synchronize and
......
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