Skip to content

Commit

Permalink
[POWERPC] powerpc: Remove SPU struct pages for PS3
Browse files Browse the repository at this point in the history
Struct page are no longer needed for SPUs, so let's not create them
on PS3 anymore.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Benjamin Herrenschmidt authored and Paul Mackerras committed Feb 13, 2007
1 parent 78bde53 commit 44430e0
Showing 1 changed file with 2 additions and 40 deletions.
42 changes: 2 additions & 40 deletions arch/powerpc/platforms/ps3/spu.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,31 +170,6 @@ static int __init construct_spu(struct spu *spu)
return result;
}

static int __init add_spu_pages(unsigned long start_addr, unsigned long size)
{
int result;
unsigned long start_pfn;
unsigned long nr_pages;
struct pglist_data *pgdata;
struct zone *zone;

BUG_ON(!mem_init_done);

start_pfn = start_addr >> PAGE_SHIFT;
nr_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;

pgdata = NODE_DATA(0);
zone = pgdata->node_zones;

result = __add_pages(zone, start_pfn, nr_pages);

if (result)
pr_debug("%s:%d: __add_pages failed: (%d)\n",
__func__, __LINE__, result);

return result;
}

static void spu_unmap(struct spu *spu)
{
iounmap(spu->priv2);
Expand All @@ -206,19 +181,6 @@ static void spu_unmap(struct spu *spu)
static int __init setup_areas(struct spu *spu)
{
struct table {char* name; unsigned long addr; unsigned long size;};
int result;

/* setup pages */

result = add_spu_pages(spu->local_store_phys, LS_SIZE);
if (result)
goto fail_add;

result = add_spu_pages(spu->problem_phys, sizeof(struct spu_problem));
if (result)
goto fail_add;

/* ioremap */

spu_pdata(spu)->shadow = __ioremap(
spu_pdata(spu)->shadow_addr, sizeof(struct spe_shadow),
Expand Down Expand Up @@ -260,8 +222,8 @@ static int __init setup_areas(struct spu *spu)

fail_ioremap:
spu_unmap(spu);
fail_add:
return result;

return -ENOMEM;
}

static int __init setup_interrupts(struct spu *spu)
Expand Down

0 comments on commit 44430e0

Please sign in to comment.