Message ID | 20130428172731.GA26169@redhat.com |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
On 04/28/2013 10:27 AM, Oleg Nesterov wrote: > On 04/28, Frederic Weisbecker wrote: >> >> On Sat, Apr 27, 2013 at 04:45:37PM +0200, Oleg Nesterov wrote: >>> >>> -/* Define reserved bits in DR6 which are always set to 1 */ >>> -#define DR6_RESERVED (0xFFFF0FF0) >>> +#define DR6_MASK (0xF00FU) /* Everything else is reserved */ >> >> I'm personally fine either with that or with Peter's suggestion to do: >> >> -#define DR6_RESERVED (0xFFFF0FF0) >> +#define DR6_RESERVED (~0xF00FUL) > > I missed this suggestion... > > Yes, and this allows to kill ifdef too. > >> If this should stay stable UAPI, > > I do not know, but I guess it would be safer to keep the old define's. > >> I really don't mind. > > Oh, I do not mind too ;) > > OK, please see v3. > Looks good. However, given the timing, I would think this is 3.11 material unless we have a manifest bug at this point. I have several bits like this that I'm going to queue up in a separate tip branch. -hpa -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/28, H. Peter Anvin wrote: > > On 04/28/2013 10:27 AM, Oleg Nesterov wrote: > > Looks good. However, given the timing, I would think this is 3.11 > material unless we have a manifest bug at this point. Yes, yes, this is only cleanup. > I have several bits like this that I'm going to queue up in a separate > tip branch. Great, thanks. Oleg. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/28/2013 10:39 AM, Oleg Nesterov wrote: > On 04/28, H. Peter Anvin wrote: >> >> On 04/28/2013 10:27 AM, Oleg Nesterov wrote: >> >> Looks good. However, given the timing, I would think this is 3.11 >> material unless we have a manifest bug at this point. > > Yes, yes, this is only cleanup. > Thanks for tackling it. I just wanted to make sure you didn't wonder why I didn't want to push it for 3.10. -hpa -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/include/uapi/asm/debugreg.h b/arch/x86/include/uapi/asm/debugreg.h index 3c0874d..4ff5d05 100644 --- a/arch/x86/include/uapi/asm/debugreg.h +++ b/arch/x86/include/uapi/asm/debugreg.h @@ -15,7 +15,7 @@ are either reserved or not of interest to us. */ /* Define reserved bits in DR6 which are always set to 1 */ -#define DR6_RESERVED (0xFFFF0FF0) +#define DR6_RESERVED (~0xF00FUL) #define DR_TRAP0 (0x1) /* db0 */ #define DR_TRAP1 (0x2) /* db1 */ @@ -64,11 +64,7 @@ We can slow the instruction pipeline for instructions coming via the gdt or the ldt if we want to. I am not sure why this is an advantage */ -#ifdef __i386__ -#define DR_CONTROL_RESERVED (0xFC00) /* Reserved by Intel */ -#else -#define DR_CONTROL_RESERVED (0xFFFFFFFF0000FC00UL) /* Reserved */ -#endif +#define DR_CONTROL_RESERVED (~0xFFFF03FFUL) /* Reserved by Intel */ #define DR_LOCAL_SLOWDOWN (0x100) /* Local slow the pipeline */ #define DR_GLOBAL_SLOWDOWN (0x200) /* Global slow the pipeline */