From 5735c18f60ce7a2018b934470cf9affc7ce13d25 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Mon, 18 Jan 2010 23:06:33 +0100 Subject: bump to 2.6.32.4 updated aufs2 patches --- PATCHCFG | 12 +- patches/aufs2-base-20091203.patch | 81 --------- patches/aufs2-base-20100116.patch | 81 +++++++++ patches/aufs2-standalone-20091203.patch | 182 --------------------- patches/aufs2-standalone-20100116.patch | 190 ++++++++++++++++++++++ patches/revert-powermanagement-intel-2.6.32.patch | 157 ------------------ 6 files changed, 275 insertions(+), 428 deletions(-) delete mode 100644 patches/aufs2-base-20091203.patch create mode 100644 patches/aufs2-base-20100116.patch delete mode 100644 patches/aufs2-standalone-20091203.patch create mode 100644 patches/aufs2-standalone-20100116.patch delete mode 100644 patches/revert-powermanagement-intel-2.6.32.patch diff --git a/PATCHCFG b/PATCHCFG index c34da6b..8519b35 100644 --- a/PATCHCFG +++ b/PATCHCFG @@ -10,22 +10,18 @@ SRCNAME="linux-2.6.32-ARCH" # filename%patchlevel (file must be in patches/ subdirectory) PATCHES=( # add upstream patch from 2.6.32 series - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.32.3.bz2%1 + ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.32.4.bz2%1 # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - - # revert intel powermanagement - # http://patchwork.kernel.org/patch/67768/ - revert-powermanagement-intel-2.6.32.patch%1 # add aufs2 support, in reference to: # http://aufs.sourceforge.net - aufs2-base-20091203.patch%1 - aufs2-standalone-20091203.patch%1 + aufs2-base-20100116.patch%1 + aufs2-standalone-20100116.patch%1 ) # Name of the resulting patch (will be bzipped afterwards) -PATCHNAME="patch-2.6.32.3-1-ARCH" +PATCHNAME="patch-2.6.32.4-1-ARCH" # Run this before applying patches pre_apply() { diff --git a/patches/aufs2-base-20091203.patch b/patches/aufs2-base-20091203.patch deleted file mode 100644 index 87980d2..0000000 --- a/patches/aufs2-base-20091203.patch +++ /dev/null @@ -1,81 +0,0 @@ -aufs2 base patch for linux-2.6. - -diff --git a/fs/namei.c b/fs/namei.c -index d11f404..7d28f56 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1219,7 +1219,7 @@ out: - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - int err; - -@@ -1229,7 +1229,7 @@ static struct dentry *lookup_hash(struct nameidata *nd) - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } - --static int __lookup_one_len(const char *name, struct qstr *this, -+int __lookup_one_len(const char *name, struct qstr *this, - struct dentry *base, int len) - { - unsigned long hash; -diff --git a/fs/splice.c b/fs/splice.c -index 7394e9e..77184f0 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1051,8 +1051,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1078,9 +1078,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index ec0f607..1438153 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -75,6 +75,9 @@ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry - extern struct file *nameidata_to_filp(struct nameidata *nd, int flags); - extern void release_open_intent(struct nameidata *); - -+extern struct dentry *lookup_hash(struct nameidata *nd); -+extern int __lookup_one_len(const char *name, struct qstr *this, -+ struct dentry *base, int len); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - extern struct dentry *lookup_one_noperm(const char *, struct dentry *); - -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 18e7c7c..8393b5c 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -82,4 +82,10 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *, - extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *, - splice_direct_actor *); - -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); -+ - #endif diff --git a/patches/aufs2-base-20100116.patch b/patches/aufs2-base-20100116.patch new file mode 100644 index 0000000..b8db42f --- /dev/null +++ b/patches/aufs2-base-20100116.patch @@ -0,0 +1,81 @@ +aufs2 base patch for linux-2.6.32 + +diff --git a/fs/namei.c b/fs/namei.c +index d11f404..7d28f56 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1219,7 +1219,7 @@ out: + * needs parent already locked. Doesn't follow mounts. + * SMP-safe. + */ +-static struct dentry *lookup_hash(struct nameidata *nd) ++struct dentry *lookup_hash(struct nameidata *nd) + { + int err; + +@@ -1229,7 +1229,7 @@ static struct dentry *lookup_hash(struct nameidata *nd) + return __lookup_hash(&nd->last, nd->path.dentry, nd); + } + +-static int __lookup_one_len(const char *name, struct qstr *this, ++int __lookup_one_len(const char *name, struct qstr *this, + struct dentry *base, int len) + { + unsigned long hash; +diff --git a/fs/splice.c b/fs/splice.c +index 7394e9e..77184f0 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1051,8 +1051,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); + /* + * Attempt to initiate a splice from pipe to file. + */ +-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, +- loff_t *ppos, size_t len, unsigned int flags) ++long do_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ loff_t *ppos, size_t len, unsigned int flags) + { + ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, + loff_t *, size_t, unsigned int); +@@ -1078,9 +1078,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + /* + * Attempt to initiate a splice from a file to a pipe. + */ +-static long do_splice_to(struct file *in, loff_t *ppos, +- struct pipe_inode_info *pipe, size_t len, +- unsigned int flags) ++long do_splice_to(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags) + { + ssize_t (*splice_read)(struct file *, loff_t *, + struct pipe_inode_info *, size_t, unsigned int); +diff --git a/include/linux/namei.h b/include/linux/namei.h +index ec0f607..1438153 100644 +--- a/include/linux/namei.h ++++ b/include/linux/namei.h +@@ -75,6 +75,9 @@ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry + extern struct file *nameidata_to_filp(struct nameidata *nd, int flags); + extern void release_open_intent(struct nameidata *); + ++extern struct dentry *lookup_hash(struct nameidata *nd); ++extern int __lookup_one_len(const char *name, struct qstr *this, ++ struct dentry *base, int len); + extern struct dentry *lookup_one_len(const char *, struct dentry *, int); + extern struct dentry *lookup_one_noperm(const char *, struct dentry *); + +diff --git a/include/linux/splice.h b/include/linux/splice.h +index 18e7c7c..8393b5c 100644 +--- a/include/linux/splice.h ++++ b/include/linux/splice.h +@@ -82,4 +82,10 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *, + extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *, + splice_direct_actor *); + ++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ loff_t *ppos, size_t len, unsigned int flags); ++extern long do_splice_to(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags); ++ + #endif diff --git a/patches/aufs2-standalone-20091203.patch b/patches/aufs2-standalone-20091203.patch deleted file mode 100644 index a87d55d..0000000 --- a/patches/aufs2-standalone-20091203.patch +++ /dev/null @@ -1,182 +0,0 @@ -aufs2 standalone patch for linux-2.6. - -diff --git a/fs/namei.c b/fs/namei.c -index 7d28f56..0f6117c 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -350,6 +350,7 @@ int deny_write_access(struct file * file) - - return 0; - } -+EXPORT_SYMBOL(deny_write_access); - - /** - * path_get - get a reference to a path -@@ -1228,6 +1229,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - return ERR_PTR(err); - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - int __lookup_one_len(const char *name, struct qstr *this, - struct dentry *base, int len) -@@ -1250,6 +1252,7 @@ int __lookup_one_len(const char *name, struct qstr *this, - this->hash = end_name_hash(hash); - return 0; - } -+EXPORT_SYMBOL(__lookup_one_len); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index bdc3cb4..a2cadcf 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -39,6 +39,7 @@ - - /* spinlock for vfsmount related operations, inplace of dcache_lock */ - __cacheline_aligned_in_smp DEFINE_SPINLOCK(vfsmount_lock); -+EXPORT_SYMBOL(vfsmount_lock); - - static int event; - static DEFINE_IDA(mnt_id_ida); -diff --git a/fs/open.c b/fs/open.c -index 4f01e06..ef09031 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -223,6 +223,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index 77184f0..8479d95 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1074,6 +1074,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1099,6 +1100,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 6cf8fd2..008e0d8 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -514,6 +514,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c -index b85e61b..a23fad4 100644 ---- a/security/integrity/ima/ima_main.c -+++ b/security/integrity/ima/ima_main.c -@@ -324,6 +324,7 @@ int ima_file_mmap(struct file *file, unsigned long prot) - MAY_EXEC, FILE_MMAP); - return 0; - } -+EXPORT_SYMBOL(ima_file_mmap); - - /** - * ima_bprm_check - based on policy, collect/store measurement. -diff --git a/security/security.c b/security/security.c -index c4c6732..854d15c 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -386,6 +386,7 @@ int security_path_mkdir(struct path *path, struct dentry *dentry, int mode) - return 0; - return security_ops->path_mkdir(path, dentry, mode); - } -+EXPORT_SYMBOL(security_path_mkdir); - - int security_path_rmdir(struct path *path, struct dentry *dentry) - { -@@ -393,6 +394,7 @@ int security_path_rmdir(struct path *path, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(path, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *path, struct dentry *dentry) - { -@@ -400,6 +402,7 @@ int security_path_unlink(struct path *path, struct dentry *dentry) - return 0; - return security_ops->path_unlink(path, dentry); - } -+EXPORT_SYMBOL(security_path_unlink); - - int security_path_symlink(struct path *path, struct dentry *dentry, - const char *old_name) -@@ -408,6 +411,7 @@ int security_path_symlink(struct path *path, struct dentry *dentry, - return 0; - return security_ops->path_symlink(path, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -416,6 +420,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -426,6 +431,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - return security_ops->path_rename(old_dir, old_dentry, new_dir, - new_dentry); - } -+EXPORT_SYMBOL(security_path_rename); - - int security_path_truncate(struct path *path, loff_t length, - unsigned int time_attrs) -@@ -434,6 +440,7 @@ int security_path_truncate(struct path *path, loff_t length, - return 0; - return security_ops->path_truncate(path, length, time_attrs); - } -+EXPORT_SYMBOL(security_path_truncate); - #endif - - int security_inode_create(struct inode *dir, struct dentry *dentry, int mode) -@@ -505,6 +512,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -519,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -619,6 +628,7 @@ int security_file_permission(struct file *file, int mask) - { - return security_ops->file_permission(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { diff --git a/patches/aufs2-standalone-20100116.patch b/patches/aufs2-standalone-20100116.patch new file mode 100644 index 0000000..6141578 --- /dev/null +++ b/patches/aufs2-standalone-20100116.patch @@ -0,0 +1,190 @@ +aufs2 standalone patch for linux-2.6.32 + +diff --git a/fs/namei.c b/fs/namei.c +index 7d28f56..0f6117c 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -350,6 +350,7 @@ int deny_write_access(struct file * file) + + return 0; + } ++EXPORT_SYMBOL(deny_write_access); + + /** + * path_get - get a reference to a path +@@ -1228,6 +1229,7 @@ struct dentry *lookup_hash(struct nameidata *nd) + return ERR_PTR(err); + return __lookup_hash(&nd->last, nd->path.dentry, nd); + } ++EXPORT_SYMBOL(lookup_hash); + + int __lookup_one_len(const char *name, struct qstr *this, + struct dentry *base, int len) +@@ -1250,6 +1252,7 @@ int __lookup_one_len(const char *name, struct qstr *this, + this->hash = end_name_hash(hash); + return 0; + } ++EXPORT_SYMBOL(__lookup_one_len); + + /** + * lookup_one_len - filesystem helper to lookup single pathname component +diff --git a/fs/namespace.c b/fs/namespace.c +index bdc3cb4..a2cadcf 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -39,6 +39,7 @@ + + /* spinlock for vfsmount related operations, inplace of dcache_lock */ + __cacheline_aligned_in_smp DEFINE_SPINLOCK(vfsmount_lock); ++EXPORT_SYMBOL(vfsmount_lock); + + static int event; + static DEFINE_IDA(mnt_id_ida); +diff --git a/fs/open.c b/fs/open.c +index 4f01e06..ef09031 100644 +--- a/fs/open.c ++++ b/fs/open.c +@@ -223,6 +223,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, + mutex_unlock(&dentry->d_inode->i_mutex); + return ret; + } ++EXPORT_SYMBOL(do_truncate); + + static long do_sys_truncate(const char __user *pathname, loff_t length) + { +diff --git a/fs/splice.c b/fs/splice.c +index 77184f0..8479d95 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1074,6 +1074,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + + return splice_write(pipe, out, ppos, len, flags); + } ++EXPORT_SYMBOL(do_splice_from); + + /* + * Attempt to initiate a splice from a file to a pipe. +@@ -1099,6 +1100,7 @@ long do_splice_to(struct file *in, loff_t *ppos, + + return splice_read(in, ppos, pipe, len, flags); + } ++EXPORT_SYMBOL(do_splice_to); + + /** + * splice_direct_to_actor - splices data directly between two non-pipes +diff --git a/security/device_cgroup.c b/security/device_cgroup.c +index 6cf8fd2..008e0d8 100644 +--- a/security/device_cgroup.c ++++ b/security/device_cgroup.c +@@ -514,6 +514,7 @@ found: + + return -EPERM; + } ++EXPORT_SYMBOL(devcgroup_inode_permission); + + int devcgroup_inode_mknod(int mode, dev_t dev) + { +diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c +index b85e61b..a23fad4 100644 +--- a/security/integrity/ima/ima_main.c ++++ b/security/integrity/ima/ima_main.c +@@ -324,6 +324,7 @@ int ima_file_mmap(struct file *file, unsigned long prot) + MAY_EXEC, FILE_MMAP); + return 0; + } ++EXPORT_SYMBOL(ima_file_mmap); + + /** + * ima_bprm_check - based on policy, collect/store measurement. +diff --git a/security/security.c b/security/security.c +index c4c6732..092cd90 100644 +--- a/security/security.c ++++ b/security/security.c +@@ -386,6 +386,7 @@ int security_path_mkdir(struct path *path, struct dentry *dentry, int mode) + return 0; + return security_ops->path_mkdir(path, dentry, mode); + } ++EXPORT_SYMBOL(security_path_mkdir); + + int security_path_rmdir(struct path *path, struct dentry *dentry) + { +@@ -393,6 +394,7 @@ int security_path_rmdir(struct path *path, struct dentry *dentry) + return 0; + return security_ops->path_rmdir(path, dentry); + } ++EXPORT_SYMBOL(security_path_rmdir); + + int security_path_unlink(struct path *path, struct dentry *dentry) + { +@@ -400,6 +402,7 @@ int security_path_unlink(struct path *path, struct dentry *dentry) + return 0; + return security_ops->path_unlink(path, dentry); + } ++EXPORT_SYMBOL(security_path_unlink); + + int security_path_symlink(struct path *path, struct dentry *dentry, + const char *old_name) +@@ -408,6 +411,7 @@ int security_path_symlink(struct path *path, struct dentry *dentry, + return 0; + return security_ops->path_symlink(path, dentry, old_name); + } ++EXPORT_SYMBOL(security_path_symlink); + + int security_path_link(struct dentry *old_dentry, struct path *new_dir, + struct dentry *new_dentry) +@@ -416,6 +420,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, + return 0; + return security_ops->path_link(old_dentry, new_dir, new_dentry); + } ++EXPORT_SYMBOL(security_path_link); + + int security_path_rename(struct path *old_dir, struct dentry *old_dentry, + struct path *new_dir, struct dentry *new_dentry) +@@ -426,6 +431,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry, + return security_ops->path_rename(old_dir, old_dentry, new_dir, + new_dentry); + } ++EXPORT_SYMBOL(security_path_rename); + + int security_path_truncate(struct path *path, loff_t length, + unsigned int time_attrs) +@@ -434,6 +440,7 @@ int security_path_truncate(struct path *path, loff_t length, + return 0; + return security_ops->path_truncate(path, length, time_attrs); + } ++EXPORT_SYMBOL(security_path_truncate); + #endif + + int security_inode_create(struct inode *dir, struct dentry *dentry, int mode) +@@ -505,6 +512,7 @@ int security_inode_readlink(struct dentry *dentry) + return 0; + return security_ops->inode_readlink(dentry); + } ++EXPORT_SYMBOL(security_inode_readlink); + + int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) + { +@@ -519,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask) + return 0; + return security_ops->inode_permission(inode, mask); + } ++EXPORT_SYMBOL(security_inode_permission); + + int security_inode_setattr(struct dentry *dentry, struct iattr *attr) + { +@@ -619,6 +628,7 @@ int security_file_permission(struct file *file, int mask) + { + return security_ops->file_permission(file, mask); + } ++EXPORT_SYMBOL(security_file_permission); + + int security_file_alloc(struct file *file) + { +@@ -641,6 +651,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, + { + return security_ops->file_mmap(file, reqprot, prot, flags, addr, addr_only); + } ++EXPORT_SYMBOL(security_file_mmap); + + int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, + unsigned long prot) diff --git a/patches/revert-powermanagement-intel-2.6.32.patch b/patches/revert-powermanagement-intel-2.6.32.patch deleted file mode 100644 index 2bf4a7e..0000000 --- a/patches/revert-powermanagement-intel-2.6.32.patch +++ /dev/null @@ -1,157 +0,0 @@ ---- linux-2.6.32/drivers/gpu/drm/i915/intel_display.c~ 2009-12-03 04:51:21.000000000 +0100 -+++ linux-2.6.32/drivers/gpu/drm/i915/intel_display.c 2009-12-26 08:15:21.000000000 +0100 -@@ -3665,125 +3665,6 @@ - queue_work(dev_priv->wq, &dev_priv->idle_work); - } - --void intel_increase_renderclock(struct drm_device *dev, bool schedule) --{ -- drm_i915_private_t *dev_priv = dev->dev_private; -- -- if (IS_IGDNG(dev)) -- return; -- -- if (!dev_priv->render_reclock_avail) { -- DRM_DEBUG("not reclocking render clock\n"); -- return; -- } -- -- /* Restore render clock frequency to original value */ -- if (IS_G4X(dev) || IS_I9XX(dev)) -- pci_write_config_word(dev->pdev, GCFGC, dev_priv->orig_clock); -- else if (IS_I85X(dev)) -- pci_write_config_word(dev->pdev, HPLLCC, dev_priv->orig_clock); -- DRM_DEBUG("increasing render clock frequency\n"); -- -- /* Schedule downclock */ -- if (schedule) -- mod_timer(&dev_priv->idle_timer, jiffies + -- msecs_to_jiffies(GPU_IDLE_TIMEOUT)); --} -- --void intel_decrease_renderclock(struct drm_device *dev) --{ -- drm_i915_private_t *dev_priv = dev->dev_private; -- -- if (IS_IGDNG(dev)) -- return; -- -- if (!dev_priv->render_reclock_avail) { -- DRM_DEBUG("not reclocking render clock\n"); -- return; -- } -- -- if (IS_G4X(dev)) { -- u16 gcfgc; -- -- /* Adjust render clock... */ -- pci_read_config_word(dev->pdev, GCFGC, &gcfgc); -- -- /* Down to minimum... */ -- gcfgc &= ~GM45_GC_RENDER_CLOCK_MASK; -- gcfgc |= GM45_GC_RENDER_CLOCK_266_MHZ; -- -- pci_write_config_word(dev->pdev, GCFGC, gcfgc); -- } else if (IS_I965G(dev)) { -- u16 gcfgc; -- -- /* Adjust render clock... */ -- pci_read_config_word(dev->pdev, GCFGC, &gcfgc); -- -- /* Down to minimum... */ -- gcfgc &= ~I965_GC_RENDER_CLOCK_MASK; -- gcfgc |= I965_GC_RENDER_CLOCK_267_MHZ; -- -- pci_write_config_word(dev->pdev, GCFGC, gcfgc); -- } else if (IS_I945G(dev) || IS_I945GM(dev)) { -- u16 gcfgc; -- -- /* Adjust render clock... */ -- pci_read_config_word(dev->pdev, GCFGC, &gcfgc); -- -- /* Down to minimum... */ -- gcfgc &= ~I945_GC_RENDER_CLOCK_MASK; -- gcfgc |= I945_GC_RENDER_CLOCK_166_MHZ; -- -- pci_write_config_word(dev->pdev, GCFGC, gcfgc); -- } else if (IS_I915G(dev)) { -- u16 gcfgc; -- -- /* Adjust render clock... */ -- pci_read_config_word(dev->pdev, GCFGC, &gcfgc); -- -- /* Down to minimum... */ -- gcfgc &= ~I915_GC_RENDER_CLOCK_MASK; -- gcfgc |= I915_GC_RENDER_CLOCK_166_MHZ; -- -- pci_write_config_word(dev->pdev, GCFGC, gcfgc); -- } else if (IS_I85X(dev)) { -- u16 hpllcc; -- -- /* Adjust render clock... */ -- pci_read_config_word(dev->pdev, HPLLCC, &hpllcc); -- -- /* Up to maximum... */ -- hpllcc &= ~GC_CLOCK_CONTROL_MASK; -- hpllcc |= GC_CLOCK_133_200; -- -- pci_write_config_word(dev->pdev, HPLLCC, hpllcc); -- } -- DRM_DEBUG("decreasing render clock frequency\n"); --} -- --/* Note that no increase function is needed for this - increase_renderclock() -- * will also rewrite these bits -- */ --void intel_decrease_displayclock(struct drm_device *dev) --{ -- if (IS_IGDNG(dev)) -- return; -- -- if (IS_I945G(dev) || IS_I945GM(dev) || IS_I915G(dev) || -- IS_I915GM(dev)) { -- u16 gcfgc; -- -- /* Adjust render clock... */ -- pci_read_config_word(dev->pdev, GCFGC, &gcfgc); -- -- /* Down to minimum... */ -- gcfgc &= ~0xf0; -- gcfgc |= 0x80; -- -- pci_write_config_word(dev->pdev, GCFGC, gcfgc); -- } --} -- - #define CRTC_IDLE_TIMEOUT 1000 /* ms */ - - static void intel_crtc_idle_timer(unsigned long arg) -@@ -3897,12 +3778,6 @@ - - mutex_lock(&dev->struct_mutex); - -- /* GPU isn't processing, downclock it. */ -- if (!dev_priv->busy) { -- intel_decrease_renderclock(dev); -- intel_decrease_displayclock(dev); -- } -- - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { - /* Skip inactive CRTCs */ - if (!crtc->fb) -@@ -3937,7 +3812,6 @@ - return; - - dev_priv->busy = true; -- intel_increase_renderclock(dev, true); - - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { - if (!crtc->fb) -@@ -4442,7 +4316,6 @@ - del_timer_sync(&intel_crtc->idle_timer); - } - -- intel_increase_renderclock(dev, false); - del_timer_sync(&dev_priv->idle_timer); - - mutex_unlock(&dev->struct_mutex); -- cgit v1.2.3-54-g00ecf