xsm: removing inclusion of byteorder.h
PATCH 1/1 xsm: removing inclusion of byteorder.h
This is to complement patch 'common: move Linux-inherited fixed width type decls to common header' by removing the unnecessary include of 'asm/byteorder.h'. In the process of removing these includes, the ordering was corrected to comply with current coding style.
--- xen/xsm/flask/ss/avtab.c | 3 +-- xen/xsm/flask/ss/conditional.c | 9 ++++----- xen/xsm/flask/ss/ebitmap.c | 8 ++++---- xen/xsm/flask/ss/policydb.c | 9 ++++----- 4 files changed, 13 insertions(+), 16 deletions(-)
xen/xsm/flask/ss/avtab.c +1 -2
@@ -19,11 +19,10 @@/* Ported to Xen 3.0, George Coker, <[email protected]> */ +#include <xen/errno.h> #include <xen/lib.h> -#include <asm/byteorder.h> #include <xen/types.h> #include <xen/xmalloc.h> -#include <xen/errno.h> #include "avtab.h" #include "policydb.h"
xen/xsm/flask/ss/conditional.c +4 -5
@@ -9,16 +9,15 @@/* Ported to Xen 3.0, George Coker, <[email protected]> */ -#include <asm/byteorder.h> -#include <xen/lib.h> -#include <xen/types.h> #include <xen/errno.h> -#include <xen/string.h> +#include <xen/lib.h> #include <xen/spinlock.h> +#include <xen/string.h> +#include <xen/types.h> #include <xen/xmalloc.h> -#include "security.h" #include "conditional.h" +#include "security.h" /* * cond_evaluate_expr evaluates a conditional expr
xen/xsm/flask/ss/ebitmap.c +4 -4
@@ -10,12 +10,12 @@/* Ported to Xen 3.0, George Coker, <[email protected]> */ -#include <asm/byteorder.h> -#include <xen/lib.h> -#include <xen/xmalloc.h> +#include <xen/bitmap.h> #include <xen/errno.h> +#include <xen/lib.h> #include <xen/spinlock.h> -#include <xen/bitmap.h> +#include <xen/xmalloc.h> +#include "ebitmap.h" #include "policydb.h"
xen/xsm/flask/ss/policydb.c +4 -5
@@ -22,18 +22,17 @@/* Ported to Xen 3.0, George Coker, <[email protected]> */ -#include <asm/byteorder.h> +#include <xen/errno.h> #include <xen/lib.h> +#include <xen/string.h> #include <xen/types.h> #include <xen/xmalloc.h> -#include <xen/string.h> -#include <xen/errno.h> #include <conditional.h> -#include "security.h" -#include "policydb.h" #include "conditional.h" #include "mls.h" +#include "policydb.h" +#include "security.h" #define _DEBUG_HASHES
Signature · 1 line
2.20.1
Quoted 6 lines · Daniel P. Smith
This is to complement patch 'common: move Linux-inherited fixed width type decls to common header' by removing the unnecessary include of '
asm/byteorder.h'. In the process of removing these includes, the ordering was corrected to comply with current coding style.Signed-off-by Daniel P. Smith <[email protected]>
I would have wanted to give this my R-b and put it in right away, but it looks like it's based on a stale tree. The patch you reference was committed a week ago (so you could also mention its hash), whereas your patch looks to be based on what was there before.
Jan
Quoted 6 lines · Daniel P. Smith
This is to complement patch 'common: move Linux-inherited fixed width type decls to common header' by removing the unnecessary include of '
asm/byteorder.h'. In the process of removing these includes, the ordering was corrected to comply with current coding style.
Quoted 7 lines
Signed-off-by Daniel P. Smith <[email protected]>--- xen/xsm/flask/ss/avtab.c | 3 +-- xen/xsm/flask/ss/conditional.c | 9 ++++----- xen/xsm/flask/ss/ebitmap.c | 8 ++++---- xen/xsm/flask/ss/policydb.c | 9 ++++----- 4 files changed, 13 insertions(+), 16 deletions(-)
These four files all call le32_to_cpu(), so AFAICT, you are trading an explicit dependency for an implicit one. Is that what you want?
Regards,
Jason
Quoted 16 lines · Jason Andryuk
Quoted 6 lines · Daniel P. Smith
This is to complement patch 'common: move Linux-inherited fixed width type decls to common header' by removing the unnecessary include of '
asm/byteorder.h'. In the process of removing these includes, the ordering was corrected to comply with current coding style.Quoted 7 lines
Signed-off-by Daniel P. Smith <[email protected]>--- xen/xsm/flask/ss/avtab.c | 3 +-- xen/xsm/flask/ss/conditional.c | 9 ++++----- xen/xsm/flask/ss/ebitmap.c | 8 ++++---- xen/xsm/flask/ss/policydb.c | 9 ++++----- 4 files changed, 13 insertions(+), 16 deletions(-)
Quoted 2 lines
These four files all call
le32_to_cpu(), so AFAICT, you are trading an explicit dependency for an implicit one. Is that what you want?
In fact, no. You comment here caused me to go back and try to see why Jan said they needed to move. I realized there was a misunderstanding about his commit message. He was not saying later, at a point in the future, they need to be moved, but that as a result of his change the inclusion ordering had to be changed. The former is what I understood and thus attempted a build without them to see if it would work. I was not expecting that conversions would have been able to be implicitly resolved.
Since I already rebased to latest stable, I can resubmit a v2 with correcting the inclusion order but with byteoder.h inclusion remaining. Though that would render this down to simply a style change patch. Would that still be acceptable Jan?
v/r,
dps
Quoted 29 lines · Daniel P. Smith
Quoted 16 lines · Jason Andryuk
Quoted 6 lines · Daniel P. Smith
This is to complement patch 'common: move Linux-inherited fixed width type decls to common header' by removing the unnecessary include of '
asm/byteorder.h'. In the process of removing these includes, the ordering was corrected to comply with current coding style.Quoted 7 lines
Signed-off-by Daniel P. Smith <[email protected]>--- xen/xsm/flask/ss/avtab.c | 3 +-- xen/xsm/flask/ss/conditional.c | 9 ++++----- xen/xsm/flask/ss/ebitmap.c | 8 ++++---- xen/xsm/flask/ss/policydb.c | 9 ++++----- 4 files changed, 13 insertions(+), 16 deletions(-)Quoted 2 lines
These four files all call
le32_to_cpu(), so AFAICT, you are trading an explicit dependency for an implicit one. Is that what you want?In fact, no. You comment here caused me to go back and try to see why Jan said they needed to move. I realized there was a misunderstanding about his commit message. He was not saying later, at a point in the future, they need to be moved, but that as a result of his change the inclusion ordering had to be changed. The former is what I understood and thus attempted a build without them to see if it would work. I was not expecting that conversions would have been able to be implicitly resolved.
Quoted 4 lines
Since I already rebased to latest stable, I can resubmit a v2 with correcting the inclusion order but with
byteoder.hinclusion remaining. Though that would render this down to simply a style change patch. Would that still be acceptable Jan?
Of course, after all you're the maintainer of this code.
Jan