Commit 80e01aaa authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] (2/6) alpha fixes

 - missing defines/fields/includes for alpha (accumulated since 2.5.0)
parent 1f2b984d
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
* (C) Copyright 1999, 2000 Richard Henderson * (C) Copyright 1999, 2000 Richard Henderson
*/ */
#include <linux/errno.h>
#include <linux/sched.h> #include <linux/sched.h>
/* /*
* Semaphores are implemented using a two-way counter: * Semaphores are implemented using a two-way counter:
* *
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define PROT_READ 0x1 /* page can be read */ #define PROT_READ 0x1 /* page can be read */
#define PROT_WRITE 0x2 /* page can be written */ #define PROT_WRITE 0x2 /* page can be written */
#define PROT_EXEC 0x4 /* page can be executed */ #define PROT_EXEC 0x4 /* page can be executed */
#define PROT_SEM 0x8 /* page may be used for atomic ops */
#define PROT_NONE 0x0 /* page can not be accessed */ #define PROT_NONE 0x0 /* page can not be accessed */
#define MAP_SHARED 0x01 /* Share changes */ #define MAP_SHARED 0x01 /* Share changes */
......
...@@ -108,6 +108,7 @@ typedef struct siginfo { ...@@ -108,6 +108,7 @@ typedef struct siginfo {
#define SI_ASYNCIO -4 /* sent by AIO completion */ #define SI_ASYNCIO -4 /* sent by AIO completion */
#define SI_SIGIO -5 /* sent by queued SIGIO */ #define SI_SIGIO -5 /* sent by queued SIGIO */
#define SI_TKILL -6 /* sent by tkill system call */ #define SI_TKILL -6 /* sent by tkill system call */
#define SI_DETHREAD -7 /* sent by execve() killing subsidiary threads */
#define SI_FROMUSER(siptr) ((siptr)->si_code <= 0) #define SI_FROMUSER(siptr) ((siptr)->si_code <= 0)
#define SI_FROMKERNEL(siptr) ((siptr)->si_code > 0) #define SI_FROMKERNEL(siptr) ((siptr)->si_code > 0)
......
...@@ -20,6 +20,7 @@ struct thread_info { ...@@ -20,6 +20,7 @@ struct thread_info {
struct exec_domain *exec_domain; /* execution domain */ struct exec_domain *exec_domain; /* execution domain */
mm_segment_t addr_limit; /* thread address space */ mm_segment_t addr_limit; /* thread address space */
int cpu; /* current CPU */ int cpu; /* current CPU */
int preempt_count; /* 0 => preemptable, <0 => BUG */
int bpt_nsaved; int bpt_nsaved;
unsigned long bpt_addr[2]; /* breakpoint handling */ unsigned long bpt_addr[2]; /* breakpoint handling */
...@@ -53,6 +54,8 @@ register struct thread_info *__current_thread_info __asm__("$8"); ...@@ -53,6 +54,8 @@ register struct thread_info *__current_thread_info __asm__("$8");
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#define PREEMPT_ACTIVE 0x4000000
/* /*
* Thread information flags: * Thread information flags:
* - these are process state flags and used from assembly * - these are process state flags and used from assembly
......
...@@ -528,6 +528,7 @@ static inline long dup(int fd) ...@@ -528,6 +528,7 @@ static inline long dup(int fd)
static inline long close(int fd) static inline long close(int fd)
{ {
extern long sys_close(unsigned int);
return sys_close(fd); return sys_close(fd);
} }
...@@ -603,6 +604,6 @@ static inline long delete_module(const char *name) ...@@ -603,6 +604,6 @@ static inline long delete_module(const char *name)
* What we want is __attribute__((weak,alias("sys_ni_syscall"))), * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
* but it doesn't work on all toolchains, so we just do it by hand * but it doesn't work on all toolchains, so we just do it by hand
*/ */
#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall"); #define cond_syscall(x) asmlinkage long x(void) __attribute__((weak,alias("sys_ni_syscall")));
#endif /* _ALPHA_UNISTD_H */ #endif /* _ALPHA_UNISTD_H */
...@@ -271,6 +271,9 @@ static void __init smp_init(void) ...@@ -271,6 +271,9 @@ static void __init smp_init(void)
#else #else
#define smp_init() do { } while (0) #define smp_init() do { } while (0)
#endif #endif
static inline void setup_per_cpu_areas(void)
{
}
static inline void setup_per_cpu_areas(void) static inline void setup_per_cpu_areas(void)
{ {
......
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