From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: michael@ellerman.id.au
Cc: linuxppc-dev@ozlabs.org
Subject: Re: [PATCH 02/11] powerpc/nvram: More flexible nvram_create_partition()
Date: Mon, 02 Aug 2010 13:54:44 +1000 [thread overview]
Message-ID: <1280721284.1902.52.camel@pasglop> (raw)
In-Reply-To: <1280720607.2491.175.camel@concordia>
On Mon, 2010-08-02 at 13:43 +1000, Michael Ellerman wrote:
> >
> > /* try creating a partition with the free space we have */
> > - rc = nvram_create_partition("ppc64,linux", );
>
> That looks odd? Trailing comma.
Yeah, that and...
> > diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c
> > index f4e4c06..2a1ef5c 100644
> > --- a/arch/powerpc/platforms/pseries/nvram.c
> > +++ b/arch/powerpc/platforms/pseries/nvram.c
> > @@ -22,14 +22,14 @@
> > #include <asm/prom.h>
> > #include <asm/machdep.h>
> >
> > +/* Max bytes to read/write in one go */
> > +#define NVRW_CNT 0x20
> > +
> > static unsigned int nvram_size;
> > static int nvram_fetch, nvram_store;
> > static char nvram_buf[NVRW_CNT]; /* assume this is in the first 4GB */
> > static DEFINE_SPINLOCK(nvram_lock);
> >
> > -/* Max bytes to read/write in one go */
> > -#define NVRW_CNT 0x20
> > -
>
> Churn alert, you just moved that hunk there in the previous patch.
... that are local rebasing fu*kage.
I'll sort all that out in the next version.
Thanks,
Ben.
next prev parent reply other threads:[~2010-08-02 3:54 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-02 0:55 [RFC] Clean up ppc64 nvram code Benjamin Herrenschmidt
2010-08-02 0:55 ` [PATCH 01/11] powerpc/nvram: Move things out of asm/nvram.h Benjamin Herrenschmidt
2010-08-02 0:55 ` [PATCH 02/11] powerpc/nvram: More flexible nvram_create_partition() Benjamin Herrenschmidt
2010-08-02 0:55 ` [PATCH 03/11] powerpc/nvram: nvram_create_partitions() now uses bytes Benjamin Herrenschmidt
2010-08-02 0:55 ` [PATCH 04/11] powerpc/nvram: Ensure that the partition header/block size is right Benjamin Herrenschmidt
2010-08-02 0:55 ` [PATCH 05/11] powerpc/nvram: Completely clear a new partition Benjamin Herrenschmidt
2010-08-02 0:55 ` [PATCH 06/11] powerpc/nvram: Shuffle code around in nvram_create_partition() Benjamin Herrenschmidt
2010-08-02 0:55 ` [PATCH 07/11] powerpc/nvram: Improve partition removal Benjamin Herrenschmidt
2010-08-02 0:55 ` [PATCH 08/11] powerpc/nvram: Add nvram_find_partition() Benjamin Herrenschmidt
2010-08-02 0:55 ` [PATCH 09/11] powerpc/nvram: Change nvram_setup_partition() to use new helper Benjamin Herrenschmidt
2010-08-02 0:55 ` [PATCH 10/11] powerpc/nvram: Move the log partition stuff to pseries Benjamin Herrenschmidt
2010-08-02 0:55 ` [PATCH 11/11] powerpc/nvram: Rename ppc64, linux partition to ibm, rtas-log Benjamin Herrenschmidt
2010-08-02 1:40 ` [PATCH 10/11] powerpc/nvram: Move the log partition stuff to pseries Benjamin Herrenschmidt
2010-08-02 3:50 ` [PATCH 05/11] powerpc/nvram: Completely clear a new partition Michael Ellerman
2010-08-02 3:47 ` [PATCH 03/11] powerpc/nvram: nvram_create_partitions() now uses bytes Michael Ellerman
2010-08-02 3:43 ` [PATCH 02/11] powerpc/nvram: More flexible nvram_create_partition() Michael Ellerman
2010-08-02 3:54 ` Benjamin Herrenschmidt [this message]
2010-08-02 7:02 ` Benjamin Herrenschmidt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1280721284.1902.52.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=michael@ellerman.id.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).