diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 10:56:04 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 10:56:04 +1100 |
| commit | 4286f84ef6d7f44de1e70b904706bdc3e1f7af01 (patch) | |
| tree | 1fd5fc121f508525d62b0bdf7cc22f16c18b110d /arch/powerpc/sysdev/fsl_rio.c | |
| parent | Merge remote-tracking branch 'jwb/next' into next (diff) | |
| parent | powerpc: document the FSL MPIC message register binding (diff) | |
| download | linux-dev-4286f84ef6d7f44de1e70b904706bdc3e1f7af01.tar.xz linux-dev-4286f84ef6d7f44de1e70b904706bdc3e1f7af01.zip | |
Merge remote-tracking branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/sysdev/fsl_rio.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_rio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c index a4c4f4a932d8..5b6f556094dd 100644 --- a/arch/powerpc/sysdev/fsl_rio.c +++ b/arch/powerpc/sysdev/fsl_rio.c @@ -66,8 +66,8 @@ " li %0,%3\n" \ " b 2b\n" \ ".section __ex_table,\"a\"\n" \ - " .align 2\n" \ - " .long 1b,3b\n" \ + PPC_LONG_ALIGN "\n" \ + PPC_LONG "1b,3b\n" \ ".text" \ : "=r" (err), "=r" (x) \ : "b" (addr), "i" (-EFAULT), "0" (err)) |