From: jbeulich@novell.com
Patch-mainline: obsolete
---- sle11-2009-02-16.orig/drivers/acpi/hardware/hwsleep.c 2009-02-17 11:19:46.000000000 +0100
-+++ sle11-2009-02-16/drivers/acpi/hardware/hwsleep.c 2009-02-16 16:01:39.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/acpi/hardware/hwsleep.c 2009-02-16 15:58:14.000000000 +0100
++++ sle11-2009-06-29/drivers/acpi/hardware/hwsleep.c 2009-02-16 16:01:39.000000000 +0100
@@ -430,6 +430,7 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_stat
* THIS FUNCTION MUST BE CALLED WITH INTERRUPTS DISABLED
*
/*******************************************************************************
*
---- sle11-2009-02-16.orig/drivers/base/cpu.c 2008-10-10 00:13:53.000000000 +0200
-+++ sle11-2009-02-16/drivers/base/cpu.c 2009-02-17 11:26:03.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/base/cpu.c 2009-06-29 15:14:52.000000000 +0200
++++ sle11-2009-06-29/drivers/base/cpu.c 2009-02-17 11:26:03.000000000 +0100
@@ -78,7 +78,7 @@ static inline void register_cpu_control(
}
#endif /* CONFIG_HOTPLUG_CPU */
if (!error)
error = sysdev_create_file(&cpu->sysdev, &attr_crash_notes);
#endif
---- sle11-2009-02-16.orig/drivers/ide/ide-lib.c 2009-02-17 11:19:46.000000000 +0100
-+++ sle11-2009-02-16/drivers/ide/ide-lib.c 2009-02-16 16:01:39.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/ide/ide-lib.c 2009-02-16 15:58:14.000000000 +0100
++++ sle11-2009-06-29/drivers/ide/ide-lib.c 2009-02-16 16:01:39.000000000 +0100
@@ -177,6 +177,16 @@ void ide_toggle_bounce(ide_drive_t *driv
{
u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */
if (drive->queue)
blk_queue_bounce_limit(drive->queue, addr);
---- sle11-2009-02-16.orig/drivers/oprofile/buffer_sync.c 2009-02-17 11:19:46.000000000 +0100
-+++ sle11-2009-02-16/drivers/oprofile/buffer_sync.c 2009-02-16 16:01:39.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/oprofile/buffer_sync.c 2009-02-16 15:58:14.000000000 +0100
++++ sle11-2009-06-29/drivers/oprofile/buffer_sync.c 2009-02-16 16:01:39.000000000 +0100
@@ -44,7 +44,9 @@ static cpumask_t marked_cpus = CPU_MASK_
static DEFINE_SPINLOCK(task_mortuary);
static void process_task_mortuary(void);
mark_done(cpu);
---- sle11-2009-02-16.orig/drivers/oprofile/cpu_buffer.c 2009-02-17 11:19:46.000000000 +0100
-+++ sle11-2009-02-16/drivers/oprofile/cpu_buffer.c 2009-02-16 16:01:39.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/oprofile/cpu_buffer.c 2009-02-16 15:58:14.000000000 +0100
++++ sle11-2009-06-29/drivers/oprofile/cpu_buffer.c 2009-02-16 16:01:39.000000000 +0100
@@ -38,7 +38,11 @@ static void wq_sync_buffer(struct work_s
#define DEFAULT_TIMER_EXPIRE (HZ / 10)
static int work_enabled;
/*
* This serves to avoid cpu buffer overflow, and makes sure
---- sle11-2009-02-16.orig/drivers/oprofile/oprof.c 2009-02-17 11:19:46.000000000 +0100
-+++ sle11-2009-02-16/drivers/oprofile/oprof.c 2009-02-16 16:01:39.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/oprofile/oprof.c 2009-02-16 15:58:14.000000000 +0100
++++ sle11-2009-06-29/drivers/oprofile/oprof.c 2009-02-16 16:01:39.000000000 +0100
@@ -37,6 +37,7 @@ static DEFINE_MUTEX(start_mutex);
*/
static int timer = 0;
int oprofile_setup(void)
{
---- sle11-2009-02-16.orig/drivers/oprofile/oprofile_files.c 2009-02-17 11:19:46.000000000 +0100
-+++ sle11-2009-02-16/drivers/oprofile/oprofile_files.c 2009-02-16 16:01:39.000000000 +0100
+--- sle11-2009-06-29.orig/drivers/oprofile/oprofile_files.c 2009-02-16 15:58:14.000000000 +0100
++++ sle11-2009-06-29/drivers/oprofile/oprofile_files.c 2009-02-16 16:01:39.000000000 +0100
@@ -124,6 +124,8 @@ static const struct file_operations dump
.write = dump_write,
};
oprofilefs_create_file(sb, root, "buffer", &event_buffer_fops);
oprofilefs_create_ulong(sb, root, "buffer_size", &fs_buffer_size);
oprofilefs_create_ulong(sb, root, "buffer_watershed", &fs_buffer_watershed);
---- sle11-2009-02-16.orig/include/linux/mm.h 2009-02-17 11:19:46.000000000 +0100
-+++ sle11-2009-02-16/include/linux/mm.h 2009-02-16 16:01:39.000000000 +0100
-@@ -187,10 +187,12 @@ struct vm_operations_struct {
+--- sle11-2009-06-29.orig/include/linux/mm.h 2009-06-29 15:17:31.000000000 +0200
++++ sle11-2009-06-29/include/linux/mm.h 2009-06-29 15:27:58.000000000 +0200
+@@ -202,10 +202,12 @@ struct vm_operations_struct {
int (*access)(struct vm_area_struct *vma, unsigned long addr,
void *buf, int len, int write);
#ifdef CONFIG_NUMA
/*
* set_policy() op must add a reference to any non-NULL @new mempolicy
---- sle11-2009-02-16.orig/include/linux/oprofile.h 2009-02-17 11:19:46.000000000 +0100
-+++ sle11-2009-02-16/include/linux/oprofile.h 2009-02-16 16:01:39.000000000 +0100
+--- sle11-2009-06-29.orig/include/linux/oprofile.h 2009-02-16 15:58:14.000000000 +0100
++++ sle11-2009-06-29/include/linux/oprofile.h 2009-06-29 15:28:01.000000000 +0200
@@ -16,8 +16,9 @@
#include <linux/types.h>
#include <linux/spinlock.h>
/* Each escaped entry is prefixed by ESCAPE_CODE
* then one of the following codes, then the
-@@ -50,11 +51,12 @@ struct oprofile_operations {
+@@ -53,11 +54,12 @@ struct oprofile_operations {
/* create any necessary configuration files in the oprofile fs.
* Optional. */
int (*create_files)(struct super_block * sb, struct dentry * root);
/* Do any necessary interrupt setup. Optional. */
int (*setup)(void);
/* Do any necessary interrupt shutdown. Optional. */
---- sle11-2009-02-16.orig/kernel/kexec.c 2008-11-25 13:31:12.000000000 +0100
-+++ sle11-2009-02-16/kernel/kexec.c 2009-02-17 11:27:16.000000000 +0100
+--- sle11-2009-06-29.orig/kernel/kexec.c 2008-11-25 13:31:12.000000000 +0100
++++ sle11-2009-06-29/kernel/kexec.c 2009-02-17 11:27:16.000000000 +0100
@@ -44,8 +44,10 @@
#include <linux/kdb.h>
#endif
#ifdef CONFIG_SYSCTL
register_sysctl_table(kexec_sys_table);
#endif
---- sle11-2009-02-16.orig/mm/memory.c 2009-02-17 11:19:46.000000000 +0100
-+++ sle11-2009-02-16/mm/memory.c 2009-02-16 16:01:39.000000000 +0100
+--- sle11-2009-06-29.orig/mm/memory.c 2009-02-16 15:58:14.000000000 +0100
++++ sle11-2009-06-29/mm/memory.c 2009-02-16 16:01:39.000000000 +0100
@@ -758,10 +758,12 @@ static unsigned long zap_pte_range(struc
page->index > details->last_index))
continue;