[-mm patch] arch/i386/pci/mmconfig.c: fixes

Adrian Bunk
2006-07-27T18:16:06Z

On Thu, Jul 27, 2006 at 01:56:39AM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.18-rc2-mm1:
>...
> +add-force-of-use-mmconfig.patch
>...
> x86 updates
>...

This patch contains the following fixes:
- add an #include <asm/setup.h> for getting the prototype of
add_memory_region()
since add_memory_region() has two "long long" parameters, it's
possible this might fix runtime corruption problems
- make the needlessly global pci_mmcfg_force() static

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

arch/i386/pci/mmconfig.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- linux-2.6.18-rc2-mm1-full/arch/i386/pci/mmconfig.c.old 2006-07-27 16:18:48.000000000 +0200
+++ linux-2.6.18-rc2-mm1-full/arch/i386/pci/mmconfig.c 2006-07-27 16:19:42.000000000 +0200
@@ -15,6 +15,7 @@
#include <linux/dmi.h>
#include <linux/efi.h>
#include <asm/e820.h>
+#include <asm/setup.h>
#include "pci.h"

/* aperture is up to 256MB but BIOS may reserve less */
@@ -225,7 +226,7 @@
* Check force MMCONFIG.
*/

-int __init pci_mmcfg_force(void)
+static int __init pci_mmcfg_force(void)
{
if (efi_enabled) {
if (dmi_check_system(pci_mmcfg_dmi_system_apple)) {