diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 15:16:41 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 15:16:41 +0900 |
| commit | 17eb9d62828c3688f41f31ac00d7fee6da9675bf (patch) | |
| tree | 03da91192242b6467d4f2d9d0b26f11f4da55c0c /arch/sh | |
| parent | 76e7461a21dfe13565b2a323b53c8cc963541126 (diff) | |
| parent | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (diff) | |
Merge branches 'sh/g3-prep' and 'sh/stable-updates'
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 4 | ||||
| -rw-r--r-- | arch/sh/mm/cache.c | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 194aaca22d4..6a8861b39f0 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -128,8 +128,6 @@ static struct platform_device nor_flash_device = { /* SH Eth */ #define SH_ETH_ADDR (0xA4600000) -#define SH_ETH_MAHR (SH_ETH_ADDR + 0x1C0) -#define SH_ETH_MALR (SH_ETH_ADDR + 0x1C8) static struct resource sh_eth_resources[] = { [0] = { .start = SH_ETH_ADDR, @@ -509,6 +507,7 @@ static struct platform_device sdhi1_device = { #else +/* MMC SPI */ static int mmc_spi_get_ro(struct device *dev) { return gpio_get_value(GPIO_PTY6); @@ -542,6 +541,7 @@ static struct spi_board_info spi_bus[] = { }, }; +/* MSIOF0 */ static struct sh_msiof_spi_info msiof0_data = { .num_chipselect = 1, }; diff --git a/arch/sh/mm/cache.c b/arch/sh/mm/cache.c index e9415d3ea94..b8607fa7ae1 100644 --- a/arch/sh/mm/cache.c +++ b/arch/sh/mm/cache.c @@ -133,12 +133,8 @@ void __update_cache(struct vm_area_struct *vma, page = pfn_to_page(pfn); if (pfn_valid(pfn)) { int dirty = test_and_clear_bit(PG_dcache_dirty, &page->flags); - if (dirty) { - unsigned long addr = (unsigned long)page_address(page); - - if (pages_do_alias(addr, address & PAGE_MASK)) - __flush_purge_region((void *)addr, PAGE_SIZE); - } + if (dirty) + __flush_purge_region(page_address(page), PAGE_SIZE); } } |