aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sky2.c
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2010-01-13 10:42:05 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-12 20:51:45 -0800
commit682137f7e6bc78e3c324874c0c213123ddc5e261 (patch)
treedc7abee5b6ac11bb3819f6e8432566651998afe6 /drivers/net/sky2.c
parentRevert "x86, apic: Use logical flat on intel with <= 8 logical cpus" (diff)
downloadlinux-dev-682137f7e6bc78e3c324874c0c213123ddc5e261.tar.xz
linux-dev-682137f7e6bc78e3c324874c0c213123ddc5e261.zip
m68knommu: fix definitions of __pa() and __va()
Fix compilation breakage of all m68knommu targets: CC arch/m68knommu/kernel/asm-offsets.s In file included from include/linux/sched.h:77, from arch/m68knommu/kernel/asm-offsets.c:12: include/linux/percpu.h: In function 'per_cpu_ptr_to_phys': include/linux/percpu.h:161: error: implicit declaration of function 'virt_to_phy This is broken in linux-2.6.33-rc3. Change the definitions of __pa() and __va() to not use virt_to_phys() and phys_to_virt(). Trivial 1:1 conversion required for the non-MMU case. A side effect if this is that the m68knommu can now use asm/virtconvert.h for the definition of virt_to_phys() and phys_to_virt(). Also cleaned up the definition of page_to_phys() when moving into virtconvert.h. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/sky2.c')
0 files changed, 0 insertions, 0 deletions