Commit 0cc9e5aa authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://are.twiddle.net/axp-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 498a7c08 ca5672fb
......@@ -4,7 +4,7 @@
EXTRA_TARGETS := head.o
EXTRA_AFLAGS := $(CFLAGS)
CFLAGS += -Werror -Wno-sign-compare
EXTRA_CFLAGS := -Werror -Wno-sign-compare
obj-y := entry.o traps.o process.o init_task.o osf_sys.o irq.o \
irq_alpha.o signal.o setup.o ptrace.o time.o semaphore.o \
......
......@@ -582,6 +582,7 @@ alpha_switch_to:
lda $8, 0x3fff
bsr $1, undo_switch_stack
bic $sp, $8, $8
mov $17, $0
ret
.end alpha_switch_to
......
......@@ -3,7 +3,7 @@
#
EXTRA_AFLAGS := $(CFLAGS)
CFLAGS += -Werror
EXTRA_CFLAGS := -Werror
L_TARGET := lib.a
......
......@@ -2,6 +2,6 @@
# Makefile for the FPU instruction emulation.
#
CFLAGS += -Iinclude/math-emu -w
EXTRA_CFLAGS := -w
obj-$(CONFIG_MATHEMU) += math.o qrnnd.o
......@@ -2,7 +2,7 @@
# Makefile for the linux alpha-specific parts of the memory manager.
#
CFLAGS += -Werror
EXTRA_CFLAGS := -Werror
obj-y := init.o fault.o extable.o remap.o
......
CFLAGS += -Werror -Wno-sign-compare
EXTRA_CFLAGS := -Werror -Wno-sign-compare
obj-$(CONFIG_OPROFILE) += oprofile.o
......
......@@ -47,7 +47,7 @@
__kir; })
# define __kernel_cmpbge(a, b) \
({ unsigned long __kir; \
__asm__("cmpbge %r2,%1,%0" : "=r"(__kir) : "rI"(b), "rJ"(val)); \
__asm__("cmpbge %r2,%1,%0" : "=r"(__kir) : "rI"(b), "rJ"(a)); \
__kir; })
# define __kernel_cttz(x) \
({ unsigned long __kir; \
......
......@@ -131,17 +131,14 @@ struct el_common_EV6_mcheck {
extern void halt(void) __attribute__((noreturn));
#define __halt() __asm__ __volatile__ ("call_pal %0 #halt" : : "i" (PAL_halt))
#define prepare_arch_schedule(prev) do { } while(0)
#define finish_arch_schedule(prev) do { } while(0)
#define switch_to(prev,next,last) \
do { \
alpha_switch_to(virt_to_phys(&(next)->thread_info->pcb), (prev)); \
#define switch_to(P,N,L) \
do { \
(L) = alpha_switch_to(virt_to_phys(&(N)->thread_info->pcb), (P)); \
check_mmu_context(); \
} while (0)
} while (0)
struct task_struct;
extern void alpha_switch_to(unsigned long, struct task_struct*);
extern struct task_struct *alpha_switch_to(unsigned long, struct task_struct*);
#define mb() \
__asm__ __volatile__("mb": : :"memory")
......
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