Commit 0b553b4d authored by Andrew Morton's avatar Andrew Morton Committed by Patrick Mochel

[PATCH] fix hugetlbpage scoping

From: norbert_wolff@t-online.de (Norbert Wolff)

In arch/i386/mm/hugetlbpage.c htlbzone_pages and htlbpage_freelist are
declared static at the Top of the File and later in set_hugetlb_mem_size()
as extern.

gcc-3.4 does not accept this conflict.
parent d2f21286
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#include <asm/tlb.h> #include <asm/tlb.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <linux/sysctl.h>
static long htlbpagemem; static long htlbpagemem;
int htlbpage_max; int htlbpage_max;
static long htlbzone_pages; static long htlbzone_pages;
...@@ -398,8 +396,6 @@ int set_hugetlb_mem_size(int count) ...@@ -398,8 +396,6 @@ int set_hugetlb_mem_size(int count)
{ {
int lcount; int lcount;
struct page *page; struct page *page;
extern long htlbzone_pages;
extern struct list_head htlbpage_freelist;
if (count < 0) if (count < 0)
lcount = count; lcount = count;
......
...@@ -12,13 +12,12 @@ ...@@ -12,13 +12,12 @@
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/sysctl.h>
#include <asm/mman.h> #include <asm/mman.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/tlb.h> #include <asm/tlb.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <linux/sysctl.h>
#define TASK_HPAGE_BASE (REGION_HPAGE << REGION_SHIFT) #define TASK_HPAGE_BASE (REGION_HPAGE << REGION_SHIFT)
static long htlbpagemem; static long htlbpagemem;
...@@ -392,8 +391,6 @@ int set_hugetlb_mem_size(int count) ...@@ -392,8 +391,6 @@ int set_hugetlb_mem_size(int count)
{ {
int lcount; int lcount;
struct page *page ; struct page *page ;
extern long htlbzone_pages;
extern struct list_head htlbpage_freelist;
if (count < 0) if (count < 0)
lcount = count; lcount = count;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment