diff options
author | 2007-11-09 15:24:19 -0800 | |
---|---|---|
committer | 2007-11-09 15:24:19 -0800 | |
commit | 45ff993d2b0b4c07038457cdf07ecf648abd3d78 (patch) | |
tree | ae2f89ce5741e36d6eaab3178d86c2cd754801e4 /include | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
parent | [ARM] pxa: fix one-shot timer mode (diff) | |
download | linux-45ff993d2b0b4c07038457cdf07ecf648abd3d78.tar.gz linux-45ff993d2b0b4c07038457cdf07ecf648abd3d78.tar.bz2 linux-45ff993d2b0b4c07038457cdf07ecf648abd3d78.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] pxa: fix one-shot timer mode
[ARM] 4645/1: Cyberpro: Trivial fix to restore 16bpp mode.
[ARM] 4644/2: fix flush_kern_tlb_range() in module space
[ARM] Allow watchdog drivers to be selected again
[ARM] 4633/1: omap build fix when FB enabled
[ARM] 4642/2: netX: default config for netx based boards
[ARM] 4641/2: netX: fix kobject_name type
[ARM] Fix iop3xx macro
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-arm/hardware/iop3xx.h | 2 | ||||
-rw-r--r-- | include/asm-arm/pgtable.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/hardware/iop3xx.h b/include/asm-arm/hardware/iop3xx.h index fb90b421f31c..ede377ec9147 100644 --- a/include/asm-arm/hardware/iop3xx.h +++ b/include/asm-arm/hardware/iop3xx.h @@ -231,7 +231,7 @@ extern int init_atu; IOP3XX_PCI_IO_WINDOW_SIZE - 1) #define IOP3XX_PCI_UPPER_IO_VA (IOP3XX_PCI_LOWER_IO_VA +\ IOP3XX_PCI_IO_WINDOW_SIZE - 1) -#define IOP3XX_PCI_IO_PHYS_TO_VIRT(addr) (((u32) addr -\ +#define IOP3XX_PCI_IO_PHYS_TO_VIRT(addr) (((u32) (addr) -\ IOP3XX_PCI_LOWER_IO_PA) +\ IOP3XX_PCI_LOWER_IO_VA) diff --git a/include/asm-arm/pgtable.h b/include/asm-arm/pgtable.h index d2e8171d1d4e..5e0182485d8c 100644 --- a/include/asm-arm/pgtable.h +++ b/include/asm-arm/pgtable.h @@ -249,7 +249,7 @@ extern struct page *empty_zero_page; #define set_pte_ext(ptep,pte,ext) cpu_set_pte_ext(ptep,pte,ext) #define set_pte_at(mm,addr,ptep,pteval) do { \ - set_pte_ext(ptep, pteval, (addr) >= PAGE_OFFSET ? 0 : PTE_EXT_NG); \ + set_pte_ext(ptep, pteval, (addr) >= TASK_SIZE ? 0 : PTE_EXT_NG); \ } while (0) /* |