| Message ID | 1481171829-116496-2-git-send-email-arei.gonglei@huawei.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Hi Gonglei. On Thu, Dec 08, 2016 at 12:37:08PM +0800, Gonglei wrote: > >> arch/sparc/include/asm/topology_64.h:44:44: > error: implicit declaration of function 'cpu_data' > [-Werror=implicit-function-declaration] > > #define topology_physical_package_id(cpu) (cpu_data(cpu).proc_id) > ^ > Let's include cpudata.h in topology_64.h. > > Cc: Sam Ravnborg <sam@ravnborg.org> > Cc: David S. Miller <davem@davemloft.net> > Cc: sparclinux@vger.kernel.org > Suggested-by: Sam Ravnborg <sam@ravnborg.org> > Signed-off-by: Gonglei <arei.gonglei@huawei.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> > --- > arch/sparc/include/asm/topology_64.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h > index 7b4898a..2255430 100644 > --- a/arch/sparc/include/asm/topology_64.h > +++ b/arch/sparc/include/asm/topology_64.h > @@ -4,6 +4,7 @@ > #ifdef CONFIG_NUMA > > #include <asm/mmzone.h> > +#include <asm/cpudata.h> Nitpick - if you are going to resend this patch, then please order the two includes in alphabetic order. For two includes this looks like bikeshedding, but when we add more having them in a defined arder prevents merge conflicts. And makes it readable too. We also sometimes order the includes with the longest lines topmost, and lines with the ame length are ordered alphabetically. But this is not seen so often. Sam -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Regards, -Gonglei > -----Original Message----- > From: linux-crypto-owner@vger.kernel.org > [mailto:linux-crypto-owner@vger.kernel.org] On Behalf Of Sam Ravnborg > Sent: Saturday, December 10, 2016 5:59 AM > To: Gonglei (Arei) > Cc: linux-kernel@vger.kernel.org; qemu-devel@nongnu.org; > virtio-dev@lists.oasis-open.org; virtualization@lists.linux-foundation.org; > linux-crypto@vger.kernel.org; Luonengjun; mst@redhat.com; > stefanha@redhat.com; Huangweidong (C); Wubin (H); xin.zeng@intel.com; > Claudio Fontana; herbert@gondor.apana.org.au; pasic@linux.vnet.ibm.com; > davem@davemloft.net; Zhoujian (jay, Euler); Hanweidong (Randy); > arei.gonglei@hotmail.com; cornelia.huck@de.ibm.com; Xuquan (Quan Xu); > longpeng; Wanzongshun (Vincent); sparclinux@vger.kernel.org > Subject: Re: [PATCH v6 1/2] sparc: fix a building error reported by kbuild > > Hi Gonglei. > > On Thu, Dec 08, 2016 at 12:37:08PM +0800, Gonglei wrote: > > >> arch/sparc/include/asm/topology_64.h:44:44: > > error: implicit declaration of function 'cpu_data' > > [-Werror=implicit-function-declaration] > > > > #define topology_physical_package_id(cpu) (cpu_data(cpu).proc_id) > > ^ > > Let's include cpudata.h in topology_64.h. > > > > Cc: Sam Ravnborg <sam@ravnborg.org> > > Cc: David S. Miller <davem@davemloft.net> > > Cc: sparclinux@vger.kernel.org > > Suggested-by: Sam Ravnborg <sam@ravnborg.org> > > Signed-off-by: Gonglei <arei.gonglei@huawei.com> > Acked-by: Sam Ravnborg <sam@ravnborg.org> > Thanks. > > --- > > arch/sparc/include/asm/topology_64.h | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/arch/sparc/include/asm/topology_64.h > b/arch/sparc/include/asm/topology_64.h > > index 7b4898a..2255430 100644 > > --- a/arch/sparc/include/asm/topology_64.h > > +++ b/arch/sparc/include/asm/topology_64.h > > @@ -4,6 +4,7 @@ > > #ifdef CONFIG_NUMA > > > > #include <asm/mmzone.h> > > +#include <asm/cpudata.h> > > Nitpick - if you are going to resend this patch, It depends on the maintainer's thought. :) > then please order the two includes in alphabetic order. > > For two includes this looks like bikeshedding, but when we add > more having them in a defined arder prevents merge conflicts. > And makes it readable too. > > We also sometimes order the includes with the longest lines topmost, > and lines with the ame length are ordered alphabetically. > But this is not seen so often. > Regards, -Gonglei -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Guys,
so was it fixed or not?
I can not compile current git kernel:
linux-2.6$ git desc
v4.9-11937-g52bce91165e5
linux-2.6$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working tree clean
linux-2.6$ git log --oneline arch/sparc/include/asm/topology_64.h | head -1
541cc39433a8 sparc: fix a building error reported by kbuild
linux-2.6$ make
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
CHK include/generated/bounds.h
CHK include/generated/timeconst.h
CHK include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
CHK include/generated/compile.h
GEN usr/initramfs_data.cpio".gz"
AS usr/initramfs_data.o
LD usr/built-in.o
CHK kernel/config_data.h
CC [M] drivers/crypto/virtio/virtio_crypto_mgr.o
In file included from ./arch/sparc/include/asm/topology.h:4:0,
from ./include/linux/topology.h:35,
from ./include/linux/gfp.h:8,
from ./include/linux/kmod.h:22,
from ./include/linux/module.h:13,
from drivers/crypto/virtio/virtio_crypto_mgr.c:21:
drivers/crypto/virtio/virtio_crypto_common.h: In function
‘virtio_crypto_get_current_node’:
./arch/sparc/include/asm/topology_64.h:45:44: error: implicit
declaration of function ‘cpu_data’
[-Werror=implicit-function-declaration]
#define topology_physical_package_id(cpu) (cpu_data(cpu).proc_id)
^
drivers/crypto/virtio/virtio_crypto_common.h:119:9: note: in expansion
of macro ‘topology_physical_package_id’
node = topology_physical_package_id(cpu);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
./arch/sparc/include/asm/topology_64.h:45:57: error: request for
member ‘proc_id’ in something not a structure or union
#define topology_physical_package_id(cpu) (cpu_data(cpu).proc_id)
^
drivers/crypto/virtio/virtio_crypto_common.h:119:9: note: in expansion
of macro ‘topology_physical_package_id’
node = topology_physical_package_id(cpu);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
scripts/Makefile.build:293: recipe for target
'drivers/crypto/virtio/virtio_crypto_mgr.o' failed
make[3]: *** [drivers/crypto/virtio/virtio_crypto_mgr.o] Error 1
scripts/Makefile.build:551: recipe for target 'drivers/crypto/virtio' failed
make[2]: *** [drivers/crypto/virtio] Error 2
scripts/Makefile.build:551: recipe for target 'drivers/crypto' failed
make[1]: *** [drivers/crypto] Error 2
Makefile:988: recipe for target 'drivers' failed
make: *** [drivers] Error 2
linux-2.6$
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h index 7b4898a..2255430 100644 --- a/arch/sparc/include/asm/topology_64.h +++ b/arch/sparc/include/asm/topology_64.h @@ -4,6 +4,7 @@ #ifdef CONFIG_NUMA #include <asm/mmzone.h> +#include <asm/cpudata.h> static inline int cpu_to_node(int cpu) {