Message ID | 4FD65F3F.3040409@uwaterloo.ca |
---|---|
State | Rejected |
Delegated to: | David Miller |
Headers | show |
--- a/arch/sparc/kernel/jump_label.c 2012-06-11 16:51:15.000000000 -0400 +++ b/arch/sparc/kernel/jump_label.c 2012-06-11 16:54:39.000000000 -0400 @@ -17,13 +17,9 @@ if (type == JUMP_LABEL_ENABLE) { s32 off = (s32)entry->target - (s32)entry->code; -#ifdef CONFIG_SPARC64 /* ba,pt %xcc, . + (off << 2) */ val = 0x10680000 | ((u32) off >> 2); -#else - /* ba . + (off << 2) */ - val = 0x10800000 | ((u32) off >> 2); -#endif + } else { val = 0x01000000; }