Re: [PATCH 0/2] jump label: update for .39

From: Steven Rostedt
Date: Thu Mar 10 2011 - 15:01:59 EST


On Thu, 2011-03-10 at 14:53 -0500, Jason Baron wrote:

> agreed. something like the following is all that's needed for x86. Sparc
> already has this, so mips just needs something similar. Steve, should I
> re-post the entire series. Or can I just post this patch separately?

Nah, I could take this as a PATCH 3/2. Just reply with your SoB.

I still want to analyze the rest of the patch set. I've been doing busy
work for now. I'll do that this afternoon.

Thanks,

-- Steve

>
> diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h
> index f217cee..57f31ff 100644
> --- a/arch/x86/include/asm/jump_label.h
> +++ b/arch/x86/include/asm/jump_label.h
> @@ -8,6 +8,7 @@
> #include <asm/asm.h>
>
> #define JUMP_LABEL_NOP_SIZE 5
> +#define BYTES_PER_LONG (BITS_PER_LONG / 8)
>
> #define JUMP_LABEL_INITIAL_NOP ".byte 0xe9 \n\t .long 0\n\t"
>
> @@ -16,9 +17,10 @@ static __always_inline bool arch_static_branch(struct jump_label_key *key)
> asm goto("1:"
> JUMP_LABEL_INITIAL_NOP
> ".pushsection __jump_table, \"aw\" \n\t"
> - _ASM_PTR "1b, %l[l_yes], %c0 \n\t"
> + ".align %c0\n\t"
> + _ASM_PTR "1b, %l[l_yes], %c1 \n\t"
> ".popsection \n\t"
> - : : "i" (key) : : l_yes);
> + : : "i" BYTES_PER_LONG, "i" (key) : : l_yes);
> return false;
> l_yes:
> return true;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/