diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-10-22 07:32:40 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-10-22 07:32:40 +0100 |
| commit | 3bcec5f076688c58436a6c354f5b94eef16469da (patch) | |
| tree | 6e50e1c03d52bffbd17b16dd6b153a428f0b9e7c /arch/mips/include/asm/jump_label.h | |
| parent | bc5bd37ce48c66e9192ad2e7231e9678880f6f8e (diff) | |
| parent | 828c79087cec61eaf4c76bb32c222fbe35ac3930 (diff) | |
Merge tag 'drm-intel-fixes-2013-10-21' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
Just an lvds clock gating fix and a pte clearing hack for hsw to avoid
memory corruption when hibernating - something doesn't seem to switch off
properly, we're still investigating.
* tag 'drm-intel-fixes-2013-10-21' of git://people.freedesktop.org/~danvet/drm-intel: (96 commits)
drm/i915: Disable GGTT PTEs on GEN6+ suspend
drm/i915: Make PTE valid encoding optional
drm/i915: disable LVDS clock gating on CPT v2
Diffstat (limited to 'arch/mips/include/asm/jump_label.h')
| -rw-r--r-- | arch/mips/include/asm/jump_label.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/jump_label.h b/arch/mips/include/asm/jump_label.h index 4d6d77ed9b9..e194f957ca8 100644 --- a/arch/mips/include/asm/jump_label.h +++ b/arch/mips/include/asm/jump_label.h @@ -22,7 +22,7 @@ static __always_inline bool arch_static_branch(struct static_key *key) { - asm goto("1:\tnop\n\t" + asm_volatile_goto("1:\tnop\n\t" "nop\n\t" ".pushsection __jump_table, \"aw\"\n\t" WORD_INSN " 1b, %l[l_yes], %0\n\t" |