The patch titled
vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system-fix
has been removed from the -mm tree. Its filename was
vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system-fix.patch
This patch was dropped because it was folded into vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system-fix
From: Mike Travis <travis@xxxxxxx>
v2: simplify setting of MAX_USER_CARDS, revert back to original default of 16
Signed-off-by: Mike Travis <travis@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Robin Holt <holt@xxxxxxx>
Cc: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Jack Steiner <steiner@xxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/vga/Kconfig | 2 +-
drivers/gpu/vga/vgaarb.c | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff -puN drivers/gpu/vga/Kconfig~vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system-fix drivers/gpu/vga/Kconfig
--- a/drivers/gpu/vga/Kconfig~vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system-fix
+++ a/drivers/gpu/vga/Kconfig
@@ -11,7 +11,7 @@ config VGA_ARB
config VGA_ARB_MAX_GPUS
int "Maximum number of GPUs"
- default 64
+ default 16
depends on VGA_ARB
help
Reserves space in the kernel to maintain resource locking for
diff -puN drivers/gpu/vga/vgaarb.c~vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system-fix drivers/gpu/vga/vgaarb.c
--- a/drivers/gpu/vga/vgaarb.c~vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system-fix
+++ a/drivers/gpu/vga/vgaarb.c
@@ -688,11 +688,7 @@ EXPORT_SYMBOL(vga_client_register);
* the arbiter.
*/
-#ifdef CONFIG_VGA_ARB_MAX_GPUS
#define MAX_USER_CARDS CONFIG_VGA_ARB_MAX_GPUS
-#else
-#define MAX_USER_CARDS 16
-#endif
#define PCI_INVALID_CARD ((struct pci_dev *)-1UL)
/*
_
Patches currently in -mm which might be from travis@xxxxxxx are
pci-update-pci_set_vga_state-to-call-arch-functions.patch
x86_64-uv-update-uv-arch-to-target-legacy-vga-i-o-correctly.patch
vgaarb-fix-vga-arbiter-to-accept-pci-domains-other-than-0.patch
vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system.patch
vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system-fix.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
