diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 23:55:59 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 23:55:59 +0200 |
| commit | b01e86fee6c821e4e003fd4e9f65453ac478a58e (patch) | |
| tree | 21695e10cbe7001d2ccc8c87cee5e7a7865b1025 /include/asm-sparc64 | |
| parent | Rename libata-bmdma.c to libata-sff.c. (diff) | |
| parent | Linux v2.6.18-rc5 (diff) | |
| download | linux-b01e86fee6c821e4e003fd4e9f65453ac478a58e.tar.xz linux-b01e86fee6c821e4e003fd4e9f65453ac478a58e.zip | |
Merge /spare/repo/linux-2.6 into upstream
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h index 1ba19eb34ce3..ebfe395cfb87 100644 --- a/include/asm-sparc64/pgtable.h +++ b/include/asm-sparc64/pgtable.h @@ -234,7 +234,7 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot) sz_bits = 0UL; if (_PAGE_SZBITS_4U != 0UL || _PAGE_SZBITS_4V != 0UL) { __asm__ __volatile__( - "\n661: sethi %uhi(%1), %0\n" + "\n661: sethi %%uhi(%1), %0\n" " sllx %0, 32, %0\n" " .section .sun4v_2insn_patch, \"ax\"\n" " .word 661b\n" |