diff options
| author | Rob Herring | 2013-11-07 17:34:46 +0100 |
|---|---|---|
| committer | Rob Herring | 2013-11-07 17:34:46 +0100 |
| commit | b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24 (patch) | |
| tree | b5fcb00387a838beb2bcf2f8ed2fd3d6d460c8ae /arch/sparc/include | |
| parent | MIPS: Netlogic: replace early_init_devtree() call (diff) | |
| parent | of/irq: Fix potential buffer overflow (diff) | |
| download | kernel-qcow2-linux-b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24.tar.gz kernel-qcow2-linux-b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24.tar.xz kernel-qcow2-linux-b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24.zip | |
Merge remote-tracking branch 'grant/devicetree/next' into for-next
Diffstat (limited to 'arch/sparc/include')
| -rw-r--r-- | arch/sparc/include/asm/floppy_64.h | 2 | ||||
| -rw-r--r-- | arch/sparc/include/asm/jump_label.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/floppy_64.h b/arch/sparc/include/asm/floppy_64.h index e204f902e6c9..7c90c50c200d 100644 --- a/arch/sparc/include/asm/floppy_64.h +++ b/arch/sparc/include/asm/floppy_64.h @@ -254,7 +254,7 @@ static int sun_fd_request_irq(void) once = 1; error = request_irq(FLOPPY_IRQ, sparc_floppy_irq, - IRQF_DISABLED, "floppy", NULL); + 0, "floppy", NULL); return ((error == 0) ? 0 : -1); } diff --git a/arch/sparc/include/asm/jump_label.h b/arch/sparc/include/asm/jump_label.h index 5080d16a832f..ec2e2e2aba7d 100644 --- a/arch/sparc/include/asm/jump_label.h +++ b/arch/sparc/include/asm/jump_label.h @@ -9,7 +9,7 @@ static __always_inline bool arch_static_branch(struct static_key *key) { - asm goto("1:\n\t" + asm_volatile_goto("1:\n\t" "nop\n\t" "nop\n\t" ".pushsection __jump_table, \"aw\"\n\t" |