Commit 674c0719 authored by Andy Grover's avatar Andy Grover Committed by Andy Grover

Merge groveronline.com:/root/bk/linux-2.5

into groveronline.com:/root/bk/linux-acpi
parents a89cc9b6 270ebb5c
......@@ -275,16 +275,17 @@ static void __init print_memory_map(char *who)
* replaces the original e820 map with a new one, removing overlaps.
*
*/
static int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map)
{
struct change_member {
struct change_member {
struct e820entry *pbios; /* pointer to original bios entry */
unsigned long long addr; /* address for this change point */
};
struct change_member change_point_list[2*E820MAX];
struct change_member *change_point[2*E820MAX];
struct e820entry *overlap_list[E820MAX];
struct e820entry new_bios[E820MAX];
};
struct change_member change_point_list[2*E820MAX] __initdata;
struct change_member *change_point[2*E820MAX] __initdata;
struct e820entry *overlap_list[E820MAX] __initdata;
struct e820entry new_bios[E820MAX] __initdata;
static int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map)
{
struct change_member *change_tmp;
unsigned long current_type, last_type;
unsigned long long last_addr;
......
......@@ -1866,6 +1866,8 @@ ssize_t generic_file_write_nolock(struct file *file, const char *buf,
if (unlikely(pos < 0))
return -EINVAL;
pagevec_init(&lru_pvec);
if (unlikely(file->f_error)) {
err = file->f_error;
file->f_error = 0;
......@@ -1976,7 +1978,6 @@ ssize_t generic_file_write_nolock(struct file *file, const char *buf,
goto out_status;
}
pagevec_init(&lru_pvec);
do {
unsigned long index;
unsigned long offset;
......
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