The patch titled
EHCI: fix memory pool name allocation
has been added to the -mm tree. Its filename is
fix-gregkh-usb-ehci-hcd-fix-budget_pool-allocation-for-machines-with-multiple-ehci-controllers.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: EHCI: fix memory pool name allocation
From: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
This patch (as802) changes the poolname allocation for the shadow budget in
ehci-mem.c. The name needs to be allocated dynamically, not on the stack,
because the memory management system continues to use it after
registration.
Also included are a couple of minor whitespace fixups (tabs instead of
spaces).
Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Cc: Christopher "Monty" Montgomery <xiphmont@xxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/usb/host/ehci-mem.c | 16 +++++-----------
drivers/usb/host/ehci.h | 5 +++--
2 files changed, 8 insertions(+), 13 deletions(-)
diff -puN drivers/usb/host/ehci.h~fix-gregkh-usb-ehci-hcd-fix-budget_pool-allocation-for-machines-with-multiple-ehci-controllers drivers/usb/host/ehci.h
--- a/drivers/usb/host/ehci.h~fix-gregkh-usb-ehci-hcd-fix-budget_pool-allocation-for-machines-with-multiple-ehci-controllers
+++ a/drivers/usb/host/ehci.h
@@ -72,8 +72,9 @@ struct ehci_hcd { /* one per controlle
int next_uframe; /* scan periodic, start here */
unsigned periodic_sched; /* periodic activity count */
- kmem_cache_t *budget_pool; /* Pool for shadow budget */
- struct ehci_shadow_budget **budget; /* pointer to the shadow budget
+ char poolname[20]; /* Shadow budget pool name */
+ kmem_cache_t *budget_pool; /* Pool for shadow budget */
+ struct ehci_shadow_budget **budget; /* pointer to the shadow budget
of bandwidth placeholders */
struct ehci_fstn *periodic_restore_fstn;
diff -puN drivers/usb/host/ehci-mem.c~fix-gregkh-usb-ehci-hcd-fix-budget_pool-allocation-for-machines-with-multiple-ehci-controllers drivers/usb/host/ehci-mem.c
--- a/drivers/usb/host/ehci-mem.c~fix-gregkh-usb-ehci-hcd-fix-budget_pool-allocation-for-machines-with-multiple-ehci-controllers
+++ a/drivers/usb/host/ehci-mem.c
@@ -293,17 +293,11 @@ static int ehci_mem_init (struct ehci_hc
goto fail;
}
- {
- char poolname[20];
-
- snprintf(poolname,20,"ehci_budget_%d",
- ehci_to_hcd(ehci)->self.busnum);
-
- ehci->budget_pool =
- kmem_cache_create (poolname,
- sizeof(struct ehci_shadow_budget),
- 0,0,NULL,NULL);
- }
+ snprintf(ehci->poolname, sizeof(ehci->poolname), "ehci-budget-%d",
+ ehci_to_hcd(ehci)->self.busnum);
+ ehci->budget_pool = kmem_cache_create(ehci->poolname,
+ sizeof(struct ehci_shadow_budget),
+ 0, 0, NULL, NULL);
if (!ehci->budget_pool)
goto fail;
_
Patches currently in -mm which might be from stern@xxxxxxxxxxxxxxxxxxx are
scsi-core-always-store-=-36-bytes-of-inquiry-data.patch
fix-gregkh-usb-usb-expand-autosuspend-autoresume-api.patch
fix-gregkh-usb-ehci-hcd-fix-budget_pool-allocation-for-machines-with-multiple-ehci-controllers.patch
powerpc-add-of_platform-support-for-ohci-bigendian-hc.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
