2.6.20-rt8 patch tweaked for 2.6.20.3

2.6.20-rt8 patch tweaked for 2.6.20.3

[John]

[-- Attachment #1: Type: text/plain, Size: 182 bytes --]

Hello,

I've tweaked patch-2.6.20-rt8 so that it applies to 2.6.20.3

The unified diff is attached to this message.

I'd be happy to hear comments on what I've done wrong!

Regards.

[-- Attachment #2: 2.6.20-to-2.6.20.3-diff --]
[-- Type: text/plain, Size: 2203 bytes --]

--- patch-2.6.20-rt8	2007-02-16 10:48:03.000000000 +0100
+++ patch-2.6.20.3-rt8	2007-03-14 18:00:24.000000000 +0100
@@ -770,8 +770,8 @@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 20
--EXTRAVERSION =
-+EXTRAVERSION = -rt8
+-EXTRAVERSION = .3
++EXTRAVERSION = .3-rt8
  NAME = Homicidal Dwarf Hamster
  
  # *DOCUMENTATION*
@@ -19927,15 +19927,6 @@
  unsigned long segment_base(u16 selector);
  
  void kvm_mmu_pre_write(struct kvm_vcpu *vcpu, gpa_t gpa, int bytes);
-@@ -558,7 +587,7 @@ static inline void load_gs(u16 sel)
- #ifndef load_ldt
- static inline void load_ldt(u16 sel)
- {
--	asm ("lldt %0" : : "g"(sel));
-+	asm ("lldt %0" : : "rm"(sel));
- }
- #endif
- 
 @@ -627,4 +656,6 @@ static inline u32 get_rdx_init_val(void)
  #define TSS_REDIRECTION_SIZE (256 / 8)
  #define RMODE_TSS_SIZE (TSS_BASE_SIZE + TSS_REDIRECTION_SIZE + TSS_IOPB_SIZE + 1)
@@ -54910,9 +54901,9 @@
 --- linux.orig/kernel/time/clocksource.c
 +++ linux/kernel/time/clocksource.c
 @@ -28,6 +28,7 @@
- #include <linux/sysdev.h>
  #include <linux/init.h>
  #include <linux/module.h>
+ #include <linux/sched.h> /* for spin_unlock_irq() using preempt_count() m68k */
 +#include <linux/tick.h>
  
  /* XXX - Would like a better way for initializing curr_clocksource */
@@ -66089,27 +66080,6 @@
  }
  
  /* When dgram socket disconnects (or changes its peer), we clear its receive
-Index: linux/net/xfrm/xfrm_user.c
-===================================================================
---- linux.orig/net/xfrm/xfrm_user.c
-+++ linux/net/xfrm/xfrm_user.c
-@@ -1273,13 +1273,12 @@ static int xfrm_get_policy(struct sk_buf
- 		xp = xfrm_policy_bysel_ctx(type, p->dir, &p->sel, tmp.security, delete);
- 		security_xfrm_policy_free(&tmp);
- 	}
--	if (delete)
--		xfrm_audit_log(NETLINK_CB(skb).loginuid, NETLINK_CB(skb).sid,
--			       AUDIT_MAC_IPSEC_DELSPD, (xp) ? 1 : 0, xp, NULL);
--
- 	if (xp == NULL)
- 		return -ENOENT;
- 
-+	xfrm_audit_log(NETLINK_CB(skb).loginuid, NETLINK_CB(skb).sid,
-+		       AUDIT_MAC_IPSEC_DELSPD, delete, xp, NULL);
-+
- 	if (!delete) {
- 		struct sk_buff *resp_skb;
- 
 Index: linux/scripts/Makefile
 ===================================================================
 --- linux.orig/scripts/Makefile

Re: 2.6.20-rt8 patch tweaked for 2.6.20.3

[John]

John wrote:

> I've tweaked patch-2.6.20-rt8 so that it applies to 2.6.20.3
> 
> The unified diff is attached to this message.
> 
> I'd be happy to hear comments on what I've done wrong!

Would anybody care to comment on the patch? :-)

I made 4 simple edits.

linux/Makefile
   trivial fix for EXTRAVERSION

linux/drivers/kvm/kvm_main.c
   remove a patch that has already been applied (?) to 2.6.20.3

linux/kernel/time/clocksource.c
   add one line, remove another, to make patch happy

linux/net/xfrm/xfrm_user.c
   remove a patch that has already been applied (?) to 2.6.20.3

Regards.