From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6720CC43334 for ; Mon, 25 Jul 2022 12:22:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234700AbiGYMWV (ORCPT ); Mon, 25 Jul 2022 08:22:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232415AbiGYMWT (ORCPT ); Mon, 25 Jul 2022 08:22:19 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2369B1A800 for ; Mon, 25 Jul 2022 05:22:17 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Lrzgp72QQz4x1N; Mon, 25 Jul 2022 22:22:14 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ellerman.id.au; s=201909; t=1658751735; bh=cmz1y9U6BERShVkGWPBKfC1B5sFPBW9aAhvI41ZOn54=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=YXczojTgkFwxQbPWFPF2zx7e5Mj9AdorE4+jm72bj1fgx/ryA4Y6bpJMaMVCN63zM S09SEe3izkieyLY45msWqdI5sPDB4vjn7TEWKdh4lOmjdhBrKhVglBaJPvQzpfzXXY h1oS95mapZD4oTBSy5Ny9EyD3LeR7yOwe6S7KHSeeZ15AH8eOCiiQ/D7cPkl/vE3nM 04C99ZtaqbgCUFmfDFDCsmppmfupiXjufeU8oE1RxQ/jYuTKTxRXoq9ysgHUioDPaN ZXZL/6U9bsyWm/PxToK16Xg9f+i/68i2qRj9YV3xFvFweOaon0a0CIksqnkhjdLMyF rXdugKMgVsldA== From: Michael Ellerman To: Yury Norov , linux-kernel@vger.kernel.org, Andy Shevchenko , Rasmus Villemoes , linuxppc-dev@lists.ozlabs.org, Benjamin Herrenschmidt , Paul Mackerras , Stephen Rothwell Cc: Yury Norov Subject: Re: [PATCH 1/2] powerpc: drop dependency on in archrandom.h In-Reply-To: <8735epd204.fsf@mpe.ellerman.id.au> References: <20220723214537.2054208-1-yury.norov@gmail.com> <20220723214537.2054208-2-yury.norov@gmail.com> <8735epd204.fsf@mpe.ellerman.id.au> Date: Mon, 25 Jul 2022 22:22:13 +1000 Message-ID: <87wnc1bcwa.fsf@mpe.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Michael Ellerman writes: > Yury Norov writes: >> archrandom.h includes to refer ppc_md. This causes >> circular header dependency, if generic nodemask.h includes random.h: >> >> In file included from include/linux/cred.h:16, >> from include/linux/seq_file.h:13, >> from arch/powerpc/include/asm/machdep.h:6, >> from arch/powerpc/include/asm/archrandom.h:5, >> from include/linux/random.h:109, >> from include/linux/nodemask.h:97, >> from include/linux/list_lru.h:12, >> from include/linux/fs.h:13, >> from include/linux/compat.h:17, >> from arch/powerpc/kernel/asm-offsets.c:12: >> include/linux/sched.h:1203:9: error: unknown type name 'nodemask_t' >> 1203 | nodemask_t mems_allowed; >> | ^~~~~~~~~~ >> >> Fix it by removing dependency from archrandom.h >> >> Signed-off-by: Yury Norov >> --- >> arch/powerpc/include/asm/archrandom.h | 9 +-------- >> arch/powerpc/kernel/setup-common.c | 11 +++++++++++ >> 2 files changed, 12 insertions(+), 8 deletions(-) >> >> diff --git a/arch/powerpc/include/asm/archrandom.h b/arch/powerpc/include/asm/archrandom.h >> index 9a53e29680f4..21def59ef1a6 100644 >> --- a/arch/powerpc/include/asm/archrandom.h >> +++ b/arch/powerpc/include/asm/archrandom.h >> @@ -4,7 +4,7 @@ >> >> #ifdef CONFIG_ARCH_RANDOM >> >> -#include >> +bool __must_check arch_get_random_seed_long(unsigned long *v); >> >> static inline bool __must_check arch_get_random_long(unsigned long *v) >> { >> @@ -16,13 +16,6 @@ static inline bool __must_check arch_get_random_int(unsigned int *v) >> return false; >> } >> >> -static inline bool __must_check arch_get_random_seed_long(unsigned long *v) >> -{ >> - if (ppc_md.get_random_seed) >> - return ppc_md.get_random_seed(v); >> - >> - return false; >> -} > > I'd rather we didn't have to force this out of line. > > I think I see a different way to fix it, I'll just do some more build > tests. Of course my idea didn't work :} So I'll just ack your patch for now, and maybe I can get the headers cleaned up in future to allow it to be out-of-line again. cheers