ngompa/kernel-rpm
1
0
Fork 0
forked from rpms/kernel
Code Pull Requests Activity

Add patch to fix POWER virtual serial driver (rhbz 738096)

Browse Source
This commit is contained in:
Josh Boyer 2011-09-14 09:44:30 -04:00
parent 5f0e65d63d
commit 86a04b4309
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
hvcs_pi_buf_alloc.patch Normal file
View File

@ -0,0 +1,43 @@
The Power platform requires the partner info buffer to be page aligned
otherwise it will fail the partner info hcall with H_PARAMETER. Switch
from using kmalloc to allocate this buffer to __get_free_page to ensure
page alignment.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
---
drivers/tty/hvc/hvcs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/tty/hvc/hvcs.c~hvcs_pi_buf_alloc drivers/tty/hvc/hvcs.c
--- linux-2.6/drivers/tty/hvc/hvcs.c~hvcs_pi_buf_alloc 2011-09-09 16:00:25.000000000 -0500
+++ linux-2.6-bjking1/drivers/tty/hvc/hvcs.c 2011-09-09 16:07:08.000000000 -0500
@@ -1532,7 +1532,7 @@ static int __devinit hvcs_initialize(voi
goto register_fail;
}
- hvcs_pi_buff = kmalloc(PAGE_SIZE, GFP_KERNEL);
+ hvcs_pi_buff = (unsigned long *) __get_free_page(GFP_KERNEL);
if (!hvcs_pi_buff) {
rc = -ENOMEM;
goto buff_alloc_fail;
@@ -1548,7 +1548,7 @@ static int __devinit hvcs_initialize(voi
return 0;
kthread_fail:
- kfree(hvcs_pi_buff);
+ free_page((unsigned long)hvcs_pi_buff);
buff_alloc_fail:
tty_unregister_driver(hvcs_tty_driver);
register_fail:
@@ -1597,7 +1597,7 @@ static void __exit hvcs_module_exit(void
kthread_stop(hvcs_task);
spin_lock(&hvcs_pi_lock);
- kfree(hvcs_pi_buff);
+ free_page((unsigned long)hvcs_pi_buff);
hvcs_pi_buff = NULL;
spin_unlock(&hvcs_pi_lock);
_

5
kernel.spec
View File

@ -728,6 +728,8 @@ Patch13006: add-macbookair41-trackpad.patch
Patch13007: add-macbookair41-keyboard.patch
Patch13008: add-macbookair41-btusb.patch
Patch13009: hvcs_pi_buf_alloc.patch
Patch20000: utrace.patch
# Flattened devicetree support
@ -1340,6 +1342,8 @@ ApplyPatch add-macbookair41-trackpad.patch
ApplyPatch add-macbookair41-keyboard.patch
ApplyPatch add-macbookair41-btusb.patch
ApplyPatch hvcs_pi_buf_alloc.patch
# utrace.
ApplyPatch utrace.patch
@ -2053,6 +2057,7 @@ fi
%changelog
* Wed Sep 14 2011 Josh Boyer <jwboyer@redhat.com>
- Add support for Macbook Air 4,1 keyboard, trackpad, and bluetooth
- Add patch to fix HVCS on ppc64 (rhbz 738096)
* Mon Sep 12 2011 Josh Boyer <jwboyer@redhat.com>
- Linux 3.1-rc6