From: David Howells <dhowells@redhat•com>
To: Alexander Graf <agraf@suse•de>
Cc: dhowells@redhat•com, Stephen Rothwell <sfr@canb•auug.org.au>,
B04825@freescale•com, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org, Liu Yu <yu.liu@freescale•com>,
Stuart Yoder <stuart.yoder@freescale•com>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>,
Paul Mackerras <paulus@samba•org>,
linuxppc-dev@lists•ozlabs.org
Subject: Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree
Date: Thu, 11 Oct 2012 17:05:57 +0100 [thread overview]
Message-ID: <14077.1349971557@warthog.procyon.org.uk> (raw)
In-Reply-To: <4C573632-7629-4E7A-8A67-FD4698B7430D@suse.de>
Alexander Graf <agraf@suse•de> wrote:
> Do I have to move them to their own header file or can I just #ifdef
> __KERNEL__ around the place where __ASSEMBLY__ starts to the end of the
> file?
That depends on whether it happens before or after my disintegration script is
run on the header. Ben has pulled my powerpc thing into the powerpc tree
already. If he doesn't mind repulling, then if you give me a patch or a git
branch to fix it, I can apply that and regenerate the powerpc branch.
Otherwise, you need to disintegrate manually:
(1) Move the public part to arch/powerpc/include/uapi/asm/epapr_hcalls.h
(2) #include the public part from arch/powerpc/include/asm/epapr_hcalls.h
(3) Move the "headers-y += epapr_hcalls.h" line from .../asm/Kbuild to
.../uapi/asm/Kbuild.
You should not then need __KERNEL__ guards in either header.
David
next prev parent reply other threads:[~2012-10-11 16:06 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-11 1:05 linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree Stephen Rothwell
2012-10-11 9:27 ` David Howells
2012-10-11 13:08 ` Alexander Graf
2012-10-11 16:05 ` David Howells [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-10-11 1:18 Stephen Rothwell
2012-10-11 1:47 ` Tabi Timur-B04825
2012-10-11 2:47 ` Stephen Rothwell
2012-10-11 3:32 ` Tabi Timur-B04825
2012-10-11 13:04 ` Alexander Graf
2012-10-11 15:50 ` Scott Wood
2012-10-11 15:56 ` Alexander Graf
2012-10-11 16:33 ` Scott Wood
2012-10-11 15:55 ` Timur Tabi
2012-10-11 16:37 ` Scott Wood
2012-10-11 17:24 ` Timur Tabi
2012-10-11 17:28 ` Scott Wood
2012-10-11 17:30 ` Timur Tabi
2012-10-11 9:28 ` David Howells
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=14077.1349971557@warthog.procyon.org.uk \
--to=dhowells@redhat$(echo .)com \
--cc=B04825@freescale$(echo .)com \
--cc=agraf@suse$(echo .)de \
--cc=benh@kernel$(echo .)crashing.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=paulus@samba$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=stuart.yoder@freescale$(echo .)com \
--cc=yu.liu@freescale$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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