]> err.no Git - linux-2.6/commitdiff
[PATCH] fix ia64 compile failure with gcc4.1
authorDave Jones <davej@redhat.com>
Thu, 29 Dec 2005 01:01:04 +0000 (20:01 -0500)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 29 Dec 2005 18:19:21 +0000 (10:19 -0800)
__get_unaligned creates a typeof the var its passed, and writes to it,
which on gcc4.1, spits out the following error:

drivers/char/vc_screen.c: In function 'vcs_write':
drivers/char/vc_screen.c:422: error: assignment of read-only variable 'val'

Signed-off-by: Dave Jones <davej@redhat.com>
[ The "right" fix would be to try to fix <asm-generic/unaligned.h>
  but that's hard to do with the tools gcc gives us. So this
  simpler patch is preferable -- Linus ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/char/vc_screen.c

index f66c7ad6fd387772b78799fad82464f0971d773d..3c1dafaa3441eacbeae9e2f924219fd5fea5e5fe 100644 (file)
@@ -419,7 +419,7 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
                        while (this_round > 1) {
                                unsigned short w;
 
-                               w = get_unaligned(((const unsigned short *)con_buf0));
+                               w = get_unaligned(((unsigned short *)con_buf0));
                                vcs_scr_writew(vc, w, org++);
                                con_buf0 += 2;
                                this_round -= 2;