Re: linux-next: manual merge of the kvm-ppc tree with the powerpc-merge tree

From
David Howells <dhowells@redhat.com>
Date
2012-10-11 16:06:16
Also in
linux-next, lkml
Reply to
Alexander Graf, 2012-10-11
Alexander Graf [off-list ref] 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
Thread (4 messages) 4 messages, 3 authors, last reply 2012-10-11
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help