From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756617Ab2JKJ1Y (ORCPT ); Thu, 11 Oct 2012 05:27:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22822 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752451Ab2JKJ1U (ORCPT ); Thu, 11 Oct 2012 05:27:20 -0400 Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: <20121011120502.0211f1267dedf3776e4cf85b@canb.auug.org.au> References: <20121011120502.0211f1267dedf3776e4cf85b@canb.auug.org.au> To: Stephen Rothwell , B04825@freescale.com Cc: dhowells@redhat.com, Alexander Graf , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Liu Yu , Stuart Yoder , Benjamin Herrenschmidt , Paul Mackerras , 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 10:27:00 +0100 Message-ID: <13876.1349947620@warthog.procyon.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen Rothwell wrote: > I just removed epapr_hcalls.h from the Kbuild file as I am not sure how > it should be broken up. David, can you have a look at this, please? Files should be broken up along around __KERNEL__ conditionals. If there are no __KERNEL__ conditionals, it is assumed that the file is entirely UAPI and can just be moved. The problem appears to be this commit: https://github.com/agraf/linux-2.6/commit/4c09029a5639c955fcf6d65205796e4f1208aed3 From: Liu Yu Subject: KVM: PPC: Add support for ePAPR idle hcall in host kernel Just makes epapr_hcalls.h part of the userspace API in its entirety by this bit of the patch: +header-y += epapr_hcalls.h whilst not adding any __KERNEL__ guards - which is almost certainly incorrect. At the very least, I would say that the global variable declarations need limiting to kernel space, and thus so do the inline functions as they emit inline assembly to jump somewhere specified by one of the global variables (actually a code array). So for manual splitting purposes, I would go with just moving all the #defines prior to the __ASSEMBLY__ guard out to uapi. Everything within the __ASSEMBLY__ guard is KABI only by the looks of it. David