BackPup/Linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-15 15:01:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge /spare/repo/linux-2.6 into upstream

Browse Source
This commit is contained in:
Jeff Garzik
2006-08-29 17:55:59 -04:00
parent e889173c2c 60d4684068
commit b01e86fee6
300 changed files with 14312 additions and 4957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm-sparc64/pgtable.h
View 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"