Commit e290e8c5 authored by Kees Cook's avatar Kees Cook Committed by H. Peter Anvin

x86, kaslr: add missed "static" declarations

This silences build warnings about unexported variables and functions.
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Link: http://lkml.kernel.org/r/20140209215644.GA30339@www.outflux.netSigned-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent b6085a86
...@@ -111,7 +111,7 @@ struct mem_vector { ...@@ -111,7 +111,7 @@ struct mem_vector {
}; };
#define MEM_AVOID_MAX 5 #define MEM_AVOID_MAX 5
struct mem_vector mem_avoid[MEM_AVOID_MAX]; static struct mem_vector mem_avoid[MEM_AVOID_MAX];
static bool mem_contains(struct mem_vector *region, struct mem_vector *item) static bool mem_contains(struct mem_vector *region, struct mem_vector *item)
{ {
...@@ -180,7 +180,7 @@ static void mem_avoid_init(unsigned long input, unsigned long input_size, ...@@ -180,7 +180,7 @@ static void mem_avoid_init(unsigned long input, unsigned long input_size,
} }
/* Does this memory vector overlap a known avoided area? */ /* Does this memory vector overlap a known avoided area? */
bool mem_avoid_overlap(struct mem_vector *img) static bool mem_avoid_overlap(struct mem_vector *img)
{ {
int i; int i;
...@@ -192,8 +192,9 @@ bool mem_avoid_overlap(struct mem_vector *img) ...@@ -192,8 +192,9 @@ bool mem_avoid_overlap(struct mem_vector *img)
return false; return false;
} }
unsigned long slots[CONFIG_RANDOMIZE_BASE_MAX_OFFSET / CONFIG_PHYSICAL_ALIGN]; static unsigned long slots[CONFIG_RANDOMIZE_BASE_MAX_OFFSET /
unsigned long slot_max = 0; CONFIG_PHYSICAL_ALIGN];
static unsigned long slot_max;
static void slots_append(unsigned long addr) static void slots_append(unsigned long addr)
{ {
......
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