Merge branch 'fix/hda' into for-linus

[mv-sheeva.git] / arch / sparc / kernel / windows.c

diff --git a/arch/sparc/kernel/windows.c b/arch/sparc/kernel/windows.c
index 9cc93eaa4abfb88ed555afcc887564c041aaeb7c..f24d298bda29d1ca0457b0b7060a366ace463756 100644 (file)
--- a/arch/sparc/kernel/windows.c
+++ b/arch/sparc/kernel/windows.c
@@ -42,7 +42,7 @@ static inline void shift_window_buffer(int first_win, int last_win, struct threa
 
        for(i = first_win; i < last_win; i++) {
                tp->rwbuf_stkptrs[i] = tp->rwbuf_stkptrs[i+1];
-               memcpy(&tp->reg_window[i], &tp->reg_window[i+1], sizeof(struct reg_window));
+               memcpy(&tp->reg_window[i], &tp->reg_window[i+1], sizeof(struct reg_window32));
        }
 }
 
@@ -70,7 +70,7 @@ void synchronize_user_stack(void)
 
                /* Ok, let it rip. */
                if (copy_to_user((char __user *) sp, &tp->reg_window[window],
-                                sizeof(struct reg_window)))
+                                sizeof(struct reg_window32)))
                        continue;
 
                shift_window_buffer(window, tp->w_saved - 1, tp);
@@ -119,7 +119,7 @@ void try_to_clear_window_buffer(struct pt_regs *regs, int who)
 
                if ((sp & 7) ||
                    copy_to_user((char __user *) sp, &tp->reg_window[window],
-                                sizeof(struct reg_window)))
+                                sizeof(struct reg_window32)))
                        do_exit(SIGILL);
        }
        tp->w_saved = 0;