]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 22 Aug 2006 22:12:58 +0000 (15:12 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 22 Aug 2006 22:12:58 +0000 (15:12 -0700)
include/asm-sparc64/pgtable.h

index 1ba19eb34ce32120b7a71366ba9e7a401597c91b..ebfe395cfb87dab31b3c79a2b545d13709f8f368 100644 (file)
@@ -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"