2005-01-19 18:07:24

by Matthew Dobson

Subject: [PATCH] Fix num_online_nodes() warning on NUMA-Q

include/asm-i386/mach-numaq/mach_apic.h complains about an implicit
declaration of num_online_nodes():

In file included from arch/i386/kernel/cpu/intel.c:19:
include/asm-i386/mach-numaq/mach_apic.h: In function `setup_portio_remap':
include/asm-i386/mach-numaq/mach_apic.h:115: warning: implicit declaration of function `num_online_nodes'

This patch gets rid of this warning. Please apply.

-Matt

diff -Nurp --exclude-from=/home/mcd/.dontdiff linux-2.6.11-rc1-mm1/include/asm-i386/mach-numaq/mach_apic.h linux-2.6.11-rc1-mm1+warn_fix/include/asm-i386/mach-numaq/mach_apic.h
--- linux-2.6.11-rc1-mm1/include/asm-i386/mach-numaq/mach_apic.h 2005-01-18 11:29:06.000000000 -0800
+++ linux-2.6.11-rc1-mm1+warn_fix/include/asm-i386/mach-numaq/mach_apic.h 2005-01-18 15:57:33.000000000 -0800
@@ -3,6 +3,7 @@

#include <asm/io.h>
#include <linux/mmzone.h>
+#include <linux/nodemask.h>

#define APIC_DFR_VALUE (APIC_DFR_CLUSTER)

2005-01-19 23:18:04

by Matthew Dobson

Subject: Re: [PATCH] Fix num_online_nodes() warning on NUMA-Q

On Wed, 2005-01-19 at 10:07, Matthew Dobson wrote:
> include/asm-i386/mach-numaq/mach_apic.h complains about an implicit
> declaration of num_online_nodes():
>
> In file included from arch/i386/kernel/cpu/intel.c:19:
> include/asm-i386/mach-numaq/mach_apic.h: In function `setup_portio_remap':
> include/asm-i386/mach-numaq/mach_apic.h:115: warning: implicit declaration of function `num_online_nodes'
>
> This patch gets rid of this warning. Please apply.
>
> -Matt

Another compilation warning/error related to the recent
num_online_nodes() work was discovered. This rollup patch fixes both
the above warning and the warnings/errors in arch/i386/pci/numa.c
discovered by Pat Mansfield.

-Matt

diff -Nurp --exclude-from=/home/mcd/.dontdiff linux-2.6.11-rc1-mm1/arch/i386/pci/numa.c linux-2.6.11-rc1-mm1+warn_fix/arch/i386/pci/numa.c
--- linux-2.6.11-rc1-mm1/arch/i386/pci/numa.c 2005-01-18 11:28:33.000000000 -0800
+++ linux-2.6.11-rc1-mm1+warn_fix/arch/i386/pci/numa.c 2005-01-19 15:07:24.000000000 -0800
@@ -4,6 +4,7 @@

#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/nodemask.h>
#include "pci.h"

#define BUS2QUAD(global) (mp_bus_id_to_node[global])
diff -Nurp --exclude-from=/home/mcd/.dontdiff linux-2.6.11-rc1-mm1/include/asm-i386/mach-numaq/mach_apic.h linux-2.6.11-rc1-mm1+warn_fix/include/asm-i386/mach-numaq/mach_apic.h
--- linux-2.6.11-rc1-mm1/include/asm-i386/mach-numaq/mach_apic.h 2005-01-18 11:29:06.000000000 -0800
+++ linux-2.6.11-rc1-mm1+warn_fix/include/asm-i386/mach-numaq/mach_apic.h 2005-01-18 15:57:33.000000000 -0800
@@ -3,6 +3,7 @@

#include <asm/io.h>
#include <linux/mmzone.h>
+#include <linux/nodemask.h>

#define APIC_DFR_VALUE (APIC_DFR_CLUSTER)