diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-02-22 17:09:53 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-02-22 17:09:53 -0300 |
| commit | 6cb3779930bb81b2e87eb0440b6a730ca99e9d56 (patch) | |
| tree | 0af039b9463ff5c40b657de200b9dd06675328dc /kernels/xen/24341.patch | |
| parent | f4e8283bcde80efd3e057defa14476a708c3d34d (diff) | |
| parent | 08ffdb45067133abf9caba2636fa2e1d98d33b58 (diff) | |
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts:
kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch
Diffstat (limited to 'kernels/xen/24341.patch')
| -rw-r--r-- | kernels/xen/24341.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/kernels/xen/24341.patch b/kernels/xen/24341.patch new file mode 100644 index 000000000..5554004d3 --- /dev/null +++ b/kernels/xen/24341.patch @@ -0,0 +1,11 @@ +--- a/xen/arch/x86/x86_64/mmconfig_64.c 2011-10-20 15:05:49.000000000 -0200 ++++ b/xen/arch/x86/x86_64/mmconfig_64.c 2012-02-14 23:45:47.481729733 -0200 +@@ -23,7 +23,7 @@ + char __iomem *virt; + }; + static struct mmcfg_virt *pci_mmcfg_virt; +-static int __initdata mmcfg_pci_segment_shift; ++static unsigned int mmcfg_pci_segment_shift; + + static char __iomem *get_virt(unsigned int seg, unsigned bus) + { |