From 9449fd5b9b7b78f0fbac35b1df533f7b339a5b19 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Thu, 4 Oct 2007 12:00:28 +1000 Subject: [PATCH] --- yaml --- r: 67526 b: refs/heads/master c: d7418031cf10fe82e16aa2057a702a2d1dab6f4a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/powermac/setup.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d659a730cdcd..c8ac943f242b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84fdde5af1eca5ff170d1dff7e2681b0a50a9ecb +refs/heads/master: d7418031cf10fe82e16aa2057a702a2d1dab6f4a diff --git a/trunk/arch/powerpc/platforms/powermac/setup.c b/trunk/arch/powerpc/platforms/powermac/setup.c index 7ccb9236e8b4..840f5b45384d 100644 --- a/trunk/arch/powerpc/platforms/powermac/setup.c +++ b/trunk/arch/powerpc/platforms/powermac/setup.c @@ -466,8 +466,13 @@ static int pmac_late_init(void) late_initcall(pmac_late_init); -/* can't be __init - can be called whenever a disk is first accessed */ -void note_bootable_part(dev_t dev, int part, int goodness) +/* + * This is __init_refok because we check for "initializing" before + * touching any of the __init sensitive things and "initializing" + * will be false after __init time. This can't be __init because it + * can be called whenever a disk is first accessed. + */ +void __init_refok note_bootable_part(dev_t dev, int part, int goodness) { static int found_boot = 0; char *p;