Fixes for premature thread_info changeset.

Minor warning removal.

diff --git a/arch/alpha/kernel/check_asm.c b/arch/alpha/kernel/check_asm.c
index 3c0a15416a27ccfe6b9dbfa78ca4d0e85cb5eebe..39432d53364eebaf78abc46d2887ed8031fa6178 100644 (file)
--- a/arch/alpha/kernel/check_asm.c
+++ b/arch/alpha/kernel/check_asm.c
@@ -14,9 +14,9 @@ void foo(void)
        OUT("#define __ASM_OFFSETS_H__");
        OUT("");
 
-       DEF("TI_TASK", offsetof(struct thread_struct, task));
-       DEF("TI_FLAGS", offsetof(struct thread_struct, flags));
-       DEF("TI_CPU", offsetof(struct thread_struct, cpu));
+       DEF("TI_TASK", offsetof(struct thread_info, task));
+       DEF("TI_FLAGS", offsetof(struct thread_info, flags));
+       DEF("TI_CPU", offsetof(struct thread_info, cpu));
 
        DEF("PT_PTRACED", PT_PTRACED);
        DEF("CLONE_VM", CLONE_VM);

diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S
index 7b0e4f9a847e2f1cb7083ebfd9a1ca3ef3e292c7..155fa05bad45b975fc41971c01c8ab3c7c89d47d 100644 (file)
--- a/arch/alpha/kernel/entry.S
+++ b/arch/alpha/kernel/entry.S
@@ -205,11 +205,10 @@ kernel_thread:
        stq     $1, SP_OFF+8($30)       /* pc */
        stq     $29, SP_OFF+16($30)     /* gp */
        stq     $16, 136($30)           /* $27; FN for child */
-       stq     $17, 160($30)           /* $16; ARG for child */
+       stq     $17, SP_OFF+24($30)     /* $16; ARG for child */
        stq     $8, 64($30)             /* $8 */
        stq     $26, 128($30)           /* $26 */
-       /* Avoid the HAE being gratuitously wrong, which would cause us
-          to go off to restore it.  */
+       /* Avoid the HAE being gratuitously wrong, to avoid restoring it.  */
        ldq     $2, alpha_mv+HAE_CACHE
        stq     $2, 152($30)            /* HAE */
 

diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 6150a3b4cc7834160f3eb175b6799b6c9da52f65..9be2d0af87ea2a1a436b955fbf8076a20a055cb3 100644 (file)
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -776,7 +776,7 @@ asmlinkage unsigned long osf_getsysinfo(unsigned long op, void *buffer,
                /* Return current software fp control & status bits.  */
                /* Note that DU doesn't verify available space here.  */
 
-               w = current_thread_info->ieee_state & IEEE_SW_MASK;
+               w = current_thread_info()->ieee_state & IEEE_SW_MASK;
                w = swcr_update_status(w, rdfpcr());
                if (put_user(w, (unsigned long *) buffer))
                        return -EFAULT;

diff --git a/arch/alpha/kernel/ptrace.c b/arch/alpha/kernel/ptrace.c
index 4b22cbbf29fdc80ee02f822307cffdcc1079984d..9b6027c31e0f45006ca32fbb3f6273a802b89ece 100644 (file)
--- a/arch/alpha/kernel/ptrace.c
+++ b/arch/alpha/kernel/ptrace.c
@@ -186,7 +186,8 @@ ptrace_set_bpt(struct task_struct * child)
                displ = ((s32)(insn << 11)) >> 9;
                child->thread_info->bpt_addr[nsaved++] = pc + 4;
                if (displ)              /* guard against unoptimized code */
-                       child->thread.bpt_addr[nsaved++] = pc + 4 + displ;
+                       child->thread_info->bpt_addr[nsaved++]
+                         = pc + 4 + displ;
                DBG(DBG_BPT, ("execing branch\n"));
        } else if (op_code == 0x1a) {
                reg_b = (insn >> 16) & 0x1f;

diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index 10a4e78aec5c0840a433206c6883da9131ab82ce..4134812b88a0473eb1fa1455a8ed009f4e09212b 100644 (file)
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -131,7 +131,7 @@ dik_show_trace(unsigned long *sp)
 
 void show_trace_task(struct task_struct * tsk)
 {
-       struct thread_info *ti = &tsk->thread_info;
+       struct thread_info *ti = tsk->thread_info;
        unsigned long fp, sp = ti->pcb.ksp, base = (unsigned long) ti;
  
        if (sp > base && sp+6*8 < base + 16*1024) {
@@ -330,7 +330,7 @@ do_entIF(unsigned long type, unsigned long a1,
                   FP registers, PAL_clrfen is not useful except for DoS
                   attacks.  So turn the bleeding FPU back on and be done
                   with it.  */
-               current_thead_info()->pcb.flags |= 1;
+               current_thread_info()->pcb.flags |= 1;
                __reload_thread(&current_thread_info()->pcb);
                return;
 

diff --git a/arch/alpha/lib/ev6-memset.S b/arch/alpha/lib/ev6-memset.S
index 626929fc5a9513f42094f9f846565ff0ea365992..c49b5a61e807f95dbc8708b3e583cf3a5cc68b20 100644 (file)
--- a/arch/alpha/lib/ev6-memset.S
+++ b/arch/alpha/lib/ev6-memset.S
@@ -236,7 +236,7 @@ end_b:
         * entry point.
         */
 .align 4
-       .ent __memset
+       .ent __constant_c_memset
 __constant_c_memset:
        .frame $30,0,$26,0
        .prologue 0

diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index f740eebd5d9376893f1c2524b77b64320dd6dec8..891699cb37b66ec34100d43ec77a33d2f4c88124 100644 (file)
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -269,7 +269,7 @@ callback_init(void * kernel_end)
 
                /* Let vmalloc know that we've allocated some space.  */
                console_remap_vm.flags = VM_ALLOC;
-               console_remap_vm.addr = VMALLOC_START;
+               console_remap_vm.addr = (void *) VMALLOC_START;
                console_remap_vm.size = vaddr - VMALLOC_START;
                vmlist = &console_remap_vm;
        }

diff --git a/include/asm-alpha/asm_offsets.h b/include/asm-alpha/asm_offsets.h
deleted file mode 100644 (file)
index 29b359d..0000000
--- a/include/asm-alpha/asm_offsets.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __ASM_OFFSETS_H__
-#define __ASM_OFFSETS_H__
-#define TASK_STATE 0
-#define TASK_FLAGS 8
-#define TASK_SIGPENDING 16
-#define TASK_ADDR_LIMIT 24
-#define TASK_EXEC_DOMAIN 32
-#define TASK_NEED_RESCHED 40
-#define TASK_SIZE 1096
-#define STACK_SIZE 16384
-#define HAE_CACHE 0
-#define HAE_REG 8
-#endif /* __ASM_OFFSETS_H__ */