commit eac8cbadc96b48ee5e5b3186f3a8ccb5219435e0
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Mon Jun 3 18:56:51 2013 +0200
- rel 2; vserver patch did contain some autogenerated files which we don't
want
kernel-vserver-2.3.patch | 199 -----------------------------------------------
kernel.spec | 2 +-
2 files changed, 1 insertion(+), 200 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 5e4e587..15a4087 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,7 +66,7 @@
%define have_pcmcia 0
%endif
-%define rel 1
+%define rel 2
%define basever 3.9
%define postver .4
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index b5e3968..74e8edd 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -738,55 +738,6 @@ diff -NurpP --minimal linux-3.9.4/arch/um/Kconfig.rest
linux-3.9.4-vs2.3.6.2/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.9.4/arch/um/include/shared/kern_constants.h
linux-3.9.4-vs2.3.6.2/arch/um/include/shared/kern_constants.h
---- linux-3.9.4/arch/um/include/shared/kern_constants.h 1970-01-01
00:00:00.000000000 +0000
-+++ linux-3.9.4-vs2.3.6.2/arch/um/include/shared/kern_constants.h
2013-05-31 14:47:11.000000000 +0000
-@@ -0,0 +1 @@
-+#include "../../../../include/generated/asm-offsets.h"
-diff -NurpP --minimal linux-3.9.4/arch/um/include/shared/user_constants.h
linux-3.9.4-vs2.3.6.2/arch/um/include/shared/user_constants.h
---- linux-3.9.4/arch/um/include/shared/user_constants.h 1970-01-01
00:00:00.000000000 +0000
-+++ linux-3.9.4-vs2.3.6.2/arch/um/include/shared/user_constants.h
2013-05-31 14:47:11.000000000 +0000
-@@ -0,0 +1,40 @@
-+/*
-+ * DO NOT MODIFY.
-+ *
-+ * This file was generated by arch/um/Makefile
-+ *
-+ */
-+
-+#define HOST_SC_CR2 176 /* offsetof(struct sigcontext, cr2) # */
-+#define HOST_SC_ERR 152 /* offsetof(struct sigcontext, err) # */
-+#define HOST_SC_TRAPNO 160 /* offsetof(struct sigcontext, trapno) # */
-+#define HOST_FP_SIZE 64 /* sizeof(struct _fpstate) / sizeof(unsigned long)
# */
-+#define HOST_RBX 5 /* RBX # */
-+#define HOST_RCX 11 /* RCX # */
-+#define HOST_RDI 14 /* RDI # */
-+#define HOST_RSI 13 /* RSI # */
-+#define HOST_RDX 12 /* RDX # */
-+#define HOST_RBP 4 /* RBP # */
-+#define HOST_RAX 10 /* RAX # */
-+#define HOST_R8 9 /* R8 # */
-+#define HOST_R9 8 /* R9 # */
-+#define HOST_R10 7 /* R10 # */
-+#define HOST_R11 6 /* R11 # */
-+#define HOST_R12 3 /* R12 # */
-+#define HOST_R13 2 /* R13 # */
-+#define HOST_R14 1 /* R14 # */
-+#define HOST_R15 0 /* R15 # */
-+#define HOST_ORIG_RAX 15 /* ORIG_RAX # */
-+#define HOST_CS 17 /* CS # */
-+#define HOST_SS 20 /* SS # */
-+#define HOST_EFLAGS 18 /* EFLAGS # */
-+#define HOST_IP 16 /* RIP # */
-+#define HOST_SP 19 /* RSP # */
-+#define UM_FRAME_SIZE 216 /* sizeof(struct user_regs_struct) # */
-+#define UM_POLLIN 1 /* POLLIN # */
-+#define UM_POLLPRI 2 /* POLLPRI # */
-+#define UM_POLLOUT 4 /* POLLOUT # */
-+#define UM_PROT_READ 1 /* PROT_READ # */
-+#define UM_PROT_WRITE 2 /* PROT_WRITE # */
-+#define UM_PROT_EXEC 4 /* PROT_EXEC # */
-+
diff -NurpP --minimal linux-3.9.4/arch/x86/Kconfig
linux-3.9.4-vs2.3.6.2/arch/x86/Kconfig
--- linux-3.9.4/arch/x86/Kconfig 2013-05-31 14:22:26.000000000 +0000
+++ linux-3.9.4-vs2.3.6.2/arch/x86/Kconfig 2013-05-31 14:47:11.000000000
+0000
@@ -25956,156 +25907,6 @@ diff -NurpP --minimal
linux-3.9.4/scripts/checksyscalls.sh linux-3.9.4-vs2.3.6.2
EOF
}
-diff -NurpP --minimal linux-3.9.4/scripts/mod/devicetable-offsets.h
linux-3.9.4-vs2.3.6.2/scripts/mod/devicetable-offsets.h
---- linux-3.9.4/scripts/mod/devicetable-offsets.h 1970-01-01
00:00:00.000000000 +0000
-+++ linux-3.9.4-vs2.3.6.2/scripts/mod/devicetable-offsets.h 2013-06-01
10:46:36.000000000 +0000
-@@ -0,0 +1,146 @@
-+#ifndef __DEVICEVTABLE_OFFSETS_H__
-+#define __DEVICEVTABLE_OFFSETS_H__
-+/*
-+ * DO NOT MODIFY.
-+ *
-+ * This file was generated by Kbuild
-+ *
-+ */
-+
-+#define SIZE_usb_device_id 32 /* sizeof(struct usb_device_id) # */
-+#define OFF_usb_device_id_match_flags 0 /* offsetof(struct usb_device_id,
match_flags) # */
-+#define OFF_usb_device_id_idVendor 2 /* offsetof(struct usb_device_id,
idVendor) # */
-+#define OFF_usb_device_id_idProduct 4 /* offsetof(struct usb_device_id,
idProduct) # */
-+#define OFF_usb_device_id_bcdDevice_lo 6 /* offsetof(struct usb_device_id,
bcdDevice_lo) # */
-+#define OFF_usb_device_id_bcdDevice_hi 8 /* offsetof(struct usb_device_id,
bcdDevice_hi) # */
-+#define OFF_usb_device_id_bDeviceClass 10 /* offsetof(struct usb_device_id,
bDeviceClass) # */
-+#define OFF_usb_device_id_bDeviceSubClass 11 /* offsetof(struct
usb_device_id, bDeviceSubClass) # */
-+#define OFF_usb_device_id_bDeviceProtocol 12 /* offsetof(struct
usb_device_id, bDeviceProtocol) # */
-+#define OFF_usb_device_id_bInterfaceClass 13 /* offsetof(struct
usb_device_id, bInterfaceClass) # */
-+#define OFF_usb_device_id_bInterfaceSubClass 14 /* offsetof(struct
usb_device_id, bInterfaceSubClass) # */
-+#define OFF_usb_device_id_bInterfaceProtocol 15 /* offsetof(struct
usb_device_id, bInterfaceProtocol) # */
-+#define OFF_usb_device_id_bInterfaceNumber 16 /* offsetof(struct
usb_device_id, bInterfaceNumber) # */
-+#define SIZE_hid_device_id 24 /* sizeof(struct hid_device_id) # */
-+#define OFF_hid_device_id_bus 0 /* offsetof(struct hid_device_id, bus)
# */
-+#define OFF_hid_device_id_group 2 /* offsetof(struct hid_device_id, group)
# */
-+#define OFF_hid_device_id_vendor 4 /* offsetof(struct hid_device_id, vendor)
# */
-+#define OFF_hid_device_id_product 8 /* offsetof(struct hid_device_id,
product) # */
-+#define SIZE_ieee1394_device_id 32 /* sizeof(struct ieee1394_device_id)
# */
-+#define OFF_ieee1394_device_id_match_flags 0 /* offsetof(struct
ieee1394_device_id, match_flags) # */
-+#define OFF_ieee1394_device_id_vendor_id 4 /* offsetof(struct
ieee1394_device_id, vendor_id) # */
-+#define OFF_ieee1394_device_id_model_id 8 /* offsetof(struct
ieee1394_device_id, model_id) # */
-+#define OFF_ieee1394_device_id_specifier_id 12 /* offsetof(struct
ieee1394_device_id, specifier_id) # */
-+#define OFF_ieee1394_device_id_version 16 /* offsetof(struct
ieee1394_device_id, version) # */
-+#define SIZE_pci_device_id 32 /* sizeof(struct pci_device_id) # */
-+#define OFF_pci_device_id_vendor 0 /* offsetof(struct pci_device_id, vendor)
# */
-+#define OFF_pci_device_id_device 4 /* offsetof(struct pci_device_id, device)
# */
-+#define OFF_pci_device_id_subvendor 8 /* offsetof(struct pci_device_id,
subvendor) # */
-+#define OFF_pci_device_id_subdevice 12 /* offsetof(struct pci_device_id,
subdevice) # */
-+#define OFF_pci_device_id_class 16 /* offsetof(struct pci_device_id, class)
# */
-+#define OFF_pci_device_id_class_mask 20 /* offsetof(struct pci_device_id,
class_mask) # */
-+#define SIZE_ccw_device_id 16 /* sizeof(struct ccw_device_id) # */
-+#define OFF_ccw_device_id_match_flags 0 /* offsetof(struct ccw_device_id,
match_flags) # */
-+#define OFF_ccw_device_id_cu_type 2 /* offsetof(struct ccw_device_id,
cu_type) # */
-+#define OFF_ccw_device_id_cu_model 6 /* offsetof(struct ccw_device_id,
cu_model) # */
-+#define OFF_ccw_device_id_dev_type 4 /* offsetof(struct ccw_device_id,
dev_type) # */
-+#define OFF_ccw_device_id_dev_model 7 /* offsetof(struct ccw_device_id,
dev_model) # */
-+#define SIZE_ap_device_id 16 /* sizeof(struct ap_device_id) # */
-+#define OFF_ap_device_id_dev_type 2 /* offsetof(struct ap_device_id,
dev_type) # */
-+#define SIZE_css_device_id 16 /* sizeof(struct css_device_id) # */
-+#define OFF_css_device_id_type 1 /* offsetof(struct css_device_id, type)
# */
-+#define SIZE_serio_device_id 4 /* sizeof(struct serio_device_id) # */
-+#define OFF_serio_device_id_type 0 /* offsetof(struct serio_device_id, type)
# */
-+#define OFF_serio_device_id_proto 3 /* offsetof(struct serio_device_id,
proto) # */
-+#define OFF_serio_device_id_id 2 /* offsetof(struct serio_device_id, id)
# */
-+#define OFF_serio_device_id_extra 1 /* offsetof(struct serio_device_id,
extra) # */
-+#define SIZE_acpi_device_id 24 /* sizeof(struct acpi_device_id) # */
-+#define OFF_acpi_device_id_id 0 /* offsetof(struct acpi_device_id, id)
# */
-+#define SIZE_pnp_device_id 16 /* sizeof(struct pnp_device_id) # */
-+#define OFF_pnp_device_id_id 0 /* offsetof(struct pnp_device_id, id) # */
-+#define SIZE_pnp_card_device_id 80 /* sizeof(struct pnp_card_device_id)
# */
-+#define OFF_pnp_card_device_id_devs 16 /* offsetof(struct pnp_card_device_id,
devs) # */
-+#define SIZE_pcmcia_device_id 80 /* sizeof(struct pcmcia_device_id) # */
-+#define OFF_pcmcia_device_id_match_flags 0 /* offsetof(struct
pcmcia_device_id, match_flags) # */
-+#define OFF_pcmcia_device_id_manf_id 2 /* offsetof(struct pcmcia_device_id,
manf_id) # */
-+#define OFF_pcmcia_device_id_card_id 4 /* offsetof(struct pcmcia_device_id,
card_id) # */
-+#define OFF_pcmcia_device_id_func_id 6 /* offsetof(struct pcmcia_device_id,
func_id) # */
-+#define OFF_pcmcia_device_id_function 7 /* offsetof(struct pcmcia_device_id,
function) # */
-+#define OFF_pcmcia_device_id_device_no 8 /* offsetof(struct pcmcia_device_id,
device_no) # */
-+#define OFF_pcmcia_device_id_prod_id_hash 12 /* offsetof(struct
pcmcia_device_id, prod_id_hash) # */
-+#define SIZE_of_device_id 200 /* sizeof(struct of_device_id) # */
-+#define OFF_of_device_id_name 0 /* offsetof(struct of_device_id, name)
# */
-+#define OFF_of_device_id_type 32 /* offsetof(struct of_device_id, type)
# */
-+#define OFF_of_device_id_compatible 64 /* offsetof(struct of_device_id,
compatible) # */
-+#define SIZE_vio_device_id 64 /* sizeof(struct vio_device_id) # */
-+#define OFF_vio_device_id_type 0 /* offsetof(struct vio_device_id, type)
# */
-+#define OFF_vio_device_id_compat 32 /* offsetof(struct vio_device_id, compat)
# */
-+#define SIZE_input_device_id 192 /* sizeof(struct input_device_id) # */
-+#define OFF_input_device_id_flags 0 /* offsetof(struct input_device_id,
flags) # */
-+#define OFF_input_device_id_bustype 8 /* offsetof(struct input_device_id,
bustype) # */
-+#define OFF_input_device_id_vendor 10 /* offsetof(struct input_device_id,
vendor) # */
-+#define OFF_input_device_id_product 12 /* offsetof(struct input_device_id,
product) # */
-+#define OFF_input_device_id_version 14 /* offsetof(struct input_device_id,
version) # */
-+#define OFF_input_device_id_evbit 16 /* offsetof(struct input_device_id,
evbit) # */
-+#define OFF_input_device_id_keybit 24 /* offsetof(struct input_device_id,
keybit) # */
-+#define OFF_input_device_id_relbit 120 /* offsetof(struct input_device_id,
relbit) # */
-+#define OFF_input_device_id_absbit 128 /* offsetof(struct input_device_id,
absbit) # */
-+#define OFF_input_device_id_mscbit 136 /* offsetof(struct input_device_id,
mscbit) # */
-+#define OFF_input_device_id_ledbit 144 /* offsetof(struct input_device_id,
ledbit) # */
-+#define OFF_input_device_id_sndbit 152 /* offsetof(struct input_device_id,
sndbit) # */
-+#define OFF_input_device_id_ffbit 160 /* offsetof(struct input_device_id,
ffbit) # */
-+#define OFF_input_device_id_swbit 176 /* offsetof(struct input_device_id,
swbit) # */
-+#define SIZE_eisa_device_id 16 /* sizeof(struct eisa_device_id) # */
-+#define OFF_eisa_device_id_sig 0 /* offsetof(struct eisa_device_id, sig)
# */
-+#define SIZE_parisc_device_id 8 /* sizeof(struct parisc_device_id) # */
-+#define OFF_parisc_device_id_hw_type 0 /* offsetof(struct parisc_device_id,
hw_type) # */
-+#define OFF_parisc_device_id_hversion 2 /* offsetof(struct parisc_device_id,
hversion) # */
-+#define OFF_parisc_device_id_hversion_rev 1 /* offsetof(struct
parisc_device_id, hversion_rev) # */
-+#define OFF_parisc_device_id_sversion 4 /* offsetof(struct parisc_device_id,
sversion) # */
-+#define SIZE_sdio_device_id 16 /* sizeof(struct sdio_device_id) # */
-+#define OFF_sdio_device_id_class 0 /* offsetof(struct sdio_device_id, class)
# */
-+#define OFF_sdio_device_id_vendor 2 /* offsetof(struct sdio_device_id,
vendor) # */
-+#define OFF_sdio_device_id_device 4 /* offsetof(struct sdio_device_id,
device) # */
-+#define SIZE_ssb_device_id 6 /* sizeof(struct ssb_device_id) # */
-+#define OFF_ssb_device_id_vendor 0 /* offsetof(struct ssb_device_id, vendor)
# */
-+#define OFF_ssb_device_id_coreid 2 /* offsetof(struct ssb_device_id, coreid)
# */
-+#define OFF_ssb_device_id_revision 4 /* offsetof(struct ssb_device_id,
revision) # */
-+#define SIZE_bcma_device_id 6 /* sizeof(struct bcma_device_id) # */
-+#define OFF_bcma_device_id_manuf 0 /* offsetof(struct bcma_device_id, manuf)
# */
-+#define OFF_bcma_device_id_id 2 /* offsetof(struct bcma_device_id, id)
# */
-+#define OFF_bcma_device_id_rev 4 /* offsetof(struct bcma_device_id, rev)
# */
-+#define OFF_bcma_device_id_class 5 /* offsetof(struct bcma_device_id, class)
# */
-+#define SIZE_virtio_device_id 8 /* sizeof(struct virtio_device_id) # */
-+#define OFF_virtio_device_id_device 0 /* offsetof(struct virtio_device_id,
device) # */
-+#define OFF_virtio_device_id_vendor 4 /* offsetof(struct virtio_device_id,
vendor) # */
-+#define SIZE_hv_vmbus_device_id 24 /* sizeof(struct hv_vmbus_device_id)
# */
-+#define OFF_hv_vmbus_device_id_guid 0 /* offsetof(struct hv_vmbus_device_id,
guid) # */
-+#define SIZE_i2c_device_id 32 /* sizeof(struct i2c_device_id) # */
-+#define OFF_i2c_device_id_name 0 /* offsetof(struct i2c_device_id, name)
# */
-+#define SIZE_spi_device_id 40 /* sizeof(struct spi_device_id) # */
-+#define OFF_spi_device_id_name 0 /* offsetof(struct spi_device_id, name)
# */
-+#define SIZE_dmi_system_id 344 /* sizeof(struct dmi_system_id) # */
-+#define OFF_dmi_system_id_matches 16 /* offsetof(struct dmi_system_id,
matches) # */
-+#define SIZE_platform_device_id 32 /* sizeof(struct platform_device_id)
# */
-+#define OFF_platform_device_id_name 0 /* offsetof(struct platform_device_id,
name) # */
-+#define SIZE_mdio_device_id 8 /* sizeof(struct mdio_device_id) # */
-+#define OFF_mdio_device_id_phy_id 0 /* offsetof(struct mdio_device_id,
phy_id) # */
-+#define OFF_mdio_device_id_phy_id_mask 4 /* offsetof(struct mdio_device_id,
phy_id_mask) # */
-+#define SIZE_zorro_device_id 16 /* sizeof(struct zorro_device_id) # */
-+#define OFF_zorro_device_id_id 0 /* offsetof(struct zorro_device_id, id)
# */
-+#define SIZE_isapnp_device_id 16 /* sizeof(struct isapnp_device_id) # */
-+#define OFF_isapnp_device_id_vendor 4 /* offsetof(struct isapnp_device_id,
vendor) # */
-+#define OFF_isapnp_device_id_function 6 /* offsetof(struct isapnp_device_id,
function) # */
-+#define SIZE_ipack_device_id 12 /* sizeof(struct ipack_device_id) # */
-+#define OFF_ipack_device_id_format 0 /* offsetof(struct ipack_device_id,
format) # */
-+#define OFF_ipack_device_id_vendor 4 /* offsetof(struct ipack_device_id,
vendor) # */
-+#define OFF_ipack_device_id_device 8 /* offsetof(struct ipack_device_id,
device) # */
-+#define SIZE_amba_id 16 /* sizeof(struct amba_id) # */
-+#define OFF_amba_id_id 0 /* offsetof(struct amba_id, id) # */
-+#define OFF_amba_id_mask 4 /* offsetof(struct amba_id, mask) # */
-+#define SIZE_x86_cpu_id 16 /* sizeof(struct x86_cpu_id) # */
-+#define OFF_x86_cpu_id_feature 6 /* offsetof(struct x86_cpu_id, feature)
# */
-+#define OFF_x86_cpu_id_family 2 /* offsetof(struct x86_cpu_id, family)
# */
-+#define OFF_x86_cpu_id_model 4 /* offsetof(struct x86_cpu_id, model) # */
-+#define OFF_x86_cpu_id_vendor 0 /* offsetof(struct x86_cpu_id, vendor)
# */
-+
-+#endif
diff -NurpP --minimal linux-3.9.4/security/commoncap.c
linux-3.9.4-vs2.3.6.2/security/commoncap.c
--- linux-3.9.4/security/commoncap.c 2013-05-31 13:45:34.000000000 +0000
+++ linux-3.9.4-vs2.3.6.2/security/commoncap.c 2013-05-31 15:07:02.000000000
+0000
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/eac8cbadc96b48ee5e5b3186f3a8ccb5219435e0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
