* [PATCH mmotm] x86/numa: fix build when CONFIG_ACPI is not set
@ 2020-08-25 15:20 Randy Dunlap
2020-08-25 23:52 ` Andrew Morton
0 siblings, 1 reply; 3+ messages in thread
From: Randy Dunlap @ 2020-08-25 15:20 UTC (permalink / raw)
To: Andrew Morton, LKML, Linux MM, Dan Williams
From: Randy Dunlap <rdunlap@infradead.org>
Fix build errors when CONFIG_ACPI is not set/enabled by adding
<acpi/acpi_numa.h> in the #else (!CONFIG_ACPI) block.
../arch/x86/mm/numa.c: In function ‘numa_setup’:
../arch/x86/mm/numa.c:43:3: error: implicit declaration of function ‘disable_srat’; did you mean ‘disable_irq’? [-Werror=implicit-function-declaration]
disable_srat();
^~~~~~~~~~~~
../arch/x86/mm/numa.c:45:3: error: implicit declaration of function ‘disable_hmat’; did you mean ‘disable_dma’? [-Werror=implicit-function-declaration]
disable_hmat();
^~~~~~~~~~~~
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Dan Williams <dan.j.williams@intel.com>
---
include/linux/acpi.h | 2 ++
1 file changed, 2 insertions(+)
--- mmotm-2020-0824-1606.orig/include/linux/acpi.h
+++ mmotm-2020-0824-1606/include/linux/acpi.h
@@ -709,6 +709,8 @@ static inline u64 acpi_arch_get_root_poi
#define ACPI_HANDLE_FWNODE(fwnode) (NULL)
#define ACPI_DEVICE_CLASS(_cls, _msk) .cls = (0), .cls_msk = (0),
+#include <acpi/acpi_numa.h>
+
struct fwnode_handle;
static inline bool acpi_dev_found(const char *hid)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH mmotm] x86/numa: fix build when CONFIG_ACPI is not set
2020-08-25 15:20 [PATCH mmotm] x86/numa: fix build when CONFIG_ACPI is not set Randy Dunlap
@ 2020-08-25 23:52 ` Andrew Morton
2020-08-26 0:13 ` Randy Dunlap
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Morton @ 2020-08-25 23:52 UTC (permalink / raw)
To: Randy Dunlap; +Cc: LKML, Linux MM, Dan Williams
On Tue, 25 Aug 2020 08:20:27 -0700 Randy Dunlap <rdunlap@infradead.org> wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
>
> Fix build errors when CONFIG_ACPI is not set/enabled by adding
> <acpi/acpi_numa.h> in the #else (!CONFIG_ACPI) block.
>
> ../arch/x86/mm/numa.c: In function ‘numa_setup’:
> ../arch/x86/mm/numa.c:43:3: error: implicit declaration of function ‘disable_srat’; did you mean ‘disable_irq’? [-Werror=implicit-function-declaration]
> disable_srat();
> ^~~~~~~~~~~~
> ../arch/x86/mm/numa.c:45:3: error: implicit declaration of function ‘disable_hmat’; did you mean ‘disable_dma’? [-Werror=implicit-function-declaration]
> disable_hmat();
> ^~~~~~~~~~~~
>
> ...
>
> --- mmotm-2020-0824-1606.orig/include/linux/acpi.h
> +++ mmotm-2020-0824-1606/include/linux/acpi.h
> @@ -709,6 +709,8 @@ static inline u64 acpi_arch_get_root_poi
> #define ACPI_HANDLE_FWNODE(fwnode) (NULL)
> #define ACPI_DEVICE_CLASS(_cls, _msk) .cls = (0), .cls_msk = (0),
>
> +#include <acpi/acpi_numa.h>
> +
> struct fwnode_handle;
>
> static inline bool acpi_dev_found(const char *hid)
I don't think there's anything in -next that caused this? It's in
mainline also?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH mmotm] x86/numa: fix build when CONFIG_ACPI is not set
2020-08-25 23:52 ` Andrew Morton
@ 2020-08-26 0:13 ` Randy Dunlap
0 siblings, 0 replies; 3+ messages in thread
From: Randy Dunlap @ 2020-08-26 0:13 UTC (permalink / raw)
To: Andrew Morton; +Cc: LKML, Linux MM, Dan Williams
On 8/25/20 4:52 PM, Andrew Morton wrote:
> On Tue, 25 Aug 2020 08:20:27 -0700 Randy Dunlap <rdunlap@infradead.org> wrote:
>
>> From: Randy Dunlap <rdunlap@infradead.org>
>>
>> Fix build errors when CONFIG_ACPI is not set/enabled by adding
>> <acpi/acpi_numa.h> in the #else (!CONFIG_ACPI) block.
>>
>> ../arch/x86/mm/numa.c: In function ‘numa_setup’:
>> ../arch/x86/mm/numa.c:43:3: error: implicit declaration of function ‘disable_srat’; did you mean ‘disable_irq’? [-Werror=implicit-function-declaration]
>> disable_srat();
>> ^~~~~~~~~~~~
>> ../arch/x86/mm/numa.c:45:3: error: implicit declaration of function ‘disable_hmat’; did you mean ‘disable_dma’? [-Werror=implicit-function-declaration]
>> disable_hmat();
>> ^~~~~~~~~~~~
>>
>> ...
>>
>> --- mmotm-2020-0824-1606.orig/include/linux/acpi.h
>> +++ mmotm-2020-0824-1606/include/linux/acpi.h
>> @@ -709,6 +709,8 @@ static inline u64 acpi_arch_get_root_poi
>> #define ACPI_HANDLE_FWNODE(fwnode) (NULL)
>> #define ACPI_DEVICE_CLASS(_cls, _msk) .cls = (0), .cls_msk = (0),
>>
>> +#include <acpi/acpi_numa.h>
>> +
>> struct fwnode_handle;
>>
>> static inline bool acpi_dev_found(const char *hid)
>
> I don't think there's anything in -next that caused this? It's in
> mainline also?
>
Calls to disable_srat() and disable_hmat() are not in v5.9-rc2.
If they are in mainline, they were added after -rc2.
See these patches in mmotm:
x86-numa-add-nohmat-option.patch
x86-numa-cleanup-configuration-dependent-command-line-options.patch
--
~Randy
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-26 0:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-25 15:20 [PATCH mmotm] x86/numa: fix build when CONFIG_ACPI is not set Randy Dunlap
2020-08-25 23:52 ` Andrew Morton
2020-08-26 0:13 ` Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).