rasdaemon: alphabetically sort includes

Reorder includes to ensure that they'll all be alphabetically
sorted.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/bitfield.c b/bitfield.c
index 17e154abfcef9e96c2975d19d8b3e4cf19b30216..7766579a12219ef2f30f3edc5572da222bd00dc0 100644 (file)
--- a/bitfield.c
+++ b/bitfield.c
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
-#include "ras-mce-handler.h"
 #include "bitfield.h"
+#include "ras-mce-handler.h"
 
 unsigned int bitfield_msg(char *buf, size_t len, const char * const *bitarray,
                          unsigned int array_len,

diff --git a/mce-amd-k8.c b/mce-amd-k8.c
index 3d71e7e04d2b9c4445d0ffdbc10ca8aabbefa88f..a937516960bbeb6026d34edf164d3098eb969d67 100644 (file)
--- a/mce-amd-k8.c
+++ b/mce-amd-k8.c
@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "ras-mce-handler.h"
 #include "bitfield.h"
+#include "ras-mce-handler.h"
 
 #define K8_MCE_THRESHOLD_BASE        (MCE_EXTENDED_BANK + 1)      /* MCE_AMD */
 #define K8_MCE_THRESHOLD_TOP         (K8_MCE_THRESHOLD_BASE + 6 * 9)

diff --git a/mce-amd-smca.c b/mce-amd-smca.c
index 298a914573c10f1de4bfdec22c31123c0943b34d..f3d4171516745976ed2a3b3f0964a2ba38152fe6 100644 (file)
--- a/mce-amd-smca.c
+++ b/mce-amd-smca.c
@@ -14,8 +14,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "ras-mce-handler.h"
 #include "bitfield.h"
+#include "ras-mce-handler.h"
 
 /* MCA_STATUS REGISTER FOR FAMILY 17H
  *********************** Higher 32-bits *****************************

diff --git a/mce-intel-broadwell-de.c b/mce-intel-broadwell-de.c
index ad2421c0bcc9c27e9770a65830122229af14b400..00670e185f6e3550f997001f78f794aa8e79343c 100644 (file)
--- a/mce-intel-broadwell-de.c
+++ b/mce-intel-broadwell-de.c
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
-#include "ras-mce-handler.h"
 #include "bitfield.h"
+#include "ras-mce-handler.h"
 
 /* See IA32 SDM Vol3B Table 16-24 */
 

diff --git a/mce-intel-broadwell-epex.c b/mce-intel-broadwell-epex.c
index 52b38155866247b30439dabf33014c4cd51ebdf4..9646e4cab7f225615c02af29807a79e69e3b6d74 100644 (file)
--- a/mce-intel-broadwell-epex.c
+++ b/mce-intel-broadwell-epex.c
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
-#include "ras-mce-handler.h"
 #include "bitfield.h"
+#include "ras-mce-handler.h"
 
 /* See IA32 SDM Vol3B Table 16-20 */
 

diff --git a/mce-intel-dunnington.c b/mce-intel-dunnington.c
index 1114fd7e16a3cfdd29e27c8d3c0abd50ce7af4df..ee75991bbeb9c2b369bfebcb813356c0822ae5a4 100644 (file)
--- a/mce-intel-dunnington.c
+++ b/mce-intel-dunnington.c
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
-#include "ras-mce-handler.h"
 #include "bitfield.h"
+#include "ras-mce-handler.h"
 
 /* Follows Intel IA32 SDM 3b Appendix E.2.1 ++ */
 

diff --git a/mce-intel-haswell.c b/mce-intel-haswell.c
index 12ec3c3d8bb7dfc4e87c90c1e90fee3779831dae..8b44464d93412420278b4ed86c3fbe620b0e5c2f 100644 (file)
--- a/mce-intel-haswell.c
+++ b/mce-intel-haswell.c
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
-#include "ras-mce-handler.h"
 #include "bitfield.h"
+#include "ras-mce-handler.h"
 
 /* See IA32 SDM Vol3B Table 16-20 */
 

diff --git a/mce-intel-i10nm.c b/mce-intel-i10nm.c
index a48686689f7d0a1fb92c47ef9e75ad2bff79835a..ea91963df3d2a7417d1c6128823e4ac92dc550f0 100644 (file)
--- a/mce-intel-i10nm.c
+++ b/mce-intel-i10nm.c
@@ -24,8 +24,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "ras-mce-handler.h"
 #include "bitfield.h"
+#include "ras-mce-handler.h"
 
 static char *pcu_1[] = {
        [0x0D] = "MCA_LLC_BIST_ACTIVE_TIMEOUT",

diff --git a/mce-intel-ivb.c b/mce-intel-ivb.c
index 3204b58b4ae0927903584bf6f3ccdf8de29b097f..36b66802206f153443f21abd3cf2dbe8a3d5ae93 100644 (file)
--- a/mce-intel-ivb.c
+++ b/mce-intel-ivb.c
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
-#include "ras-mce-handler.h"
 #include "bitfield.h"
+#include "ras-mce-handler.h"
 
 /* See IA32 SDM Vol3B Table 16-17 */
 

diff --git a/mce-intel-knl.c b/mce-intel-knl.c
index ff00ca935b3feca50a04277c48f10457fc9a565a..50baa2a641ba209021f32696f926190f07dd9bcc 100644 (file)
--- a/mce-intel-knl.c
+++ b/mce-intel-knl.c
@@ -14,11 +14,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
-#include "ras-mce-handler.h"
 #include "bitfield.h"
+#include "ras-mce-handler.h"
 
 static struct field memctrl_mc7[] = {
        SBITFIELD(16, "CA Parity error"),

diff --git a/mce-intel-nehalem.c b/mce-intel-nehalem.c
index 1ab0ef3beeacad0d95cc721a60b23f1c1382e175..aca85e7dfa79bf5ea32ec37e2e87a221262d6af6 100644 (file)
--- a/mce-intel-nehalem.c
+++ b/mce-intel-nehalem.c
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
-#include "ras-mce-handler.h"
 #include "bitfield.h"
+#include "ras-mce-handler.h"
 
 /* See IA32 SDM Vol3B Appendix E.3.2 ff */
 

diff --git a/mce-intel-p4-p6.c b/mce-intel-p4-p6.c
index ecd266f1111d99afec4bdcfce4f29b48c425b161..9f93314e89aec1b8513966bb6b7bf1db02531017 100644 (file)
--- a/mce-intel-p4-p6.c
+++ b/mce-intel-p4-p6.c
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
-#include "ras-mce-handler.h"
 #include "bitfield.h"
+#include "ras-mce-handler.h"
 
 /* Decode P4 and P6 family (p6old and Core2) model specific errors */
 

diff --git a/mce-intel-sb.c b/mce-intel-sb.c
index 0d546b929f31dd028815372680a8523bd9b8a836..bffdd5b48e0379a13413d7548e1bd0be559d876b 100644 (file)
--- a/mce-intel-sb.c
+++ b/mce-intel-sb.c
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
-#include "ras-mce-handler.h"
 #include "bitfield.h"
+#include "ras-mce-handler.h"
 
 /* See IA32 SDM Vol3B Table 16.4.1 */
 

diff --git a/mce-intel-skylake-xeon.c b/mce-intel-skylake-xeon.c
index fdf02b9738632354d2b96a2e198c576d1d24c8c8..e8ff33714273b6afe72b94b84e0b9030b047f363 100644 (file)
--- a/mce-intel-skylake-xeon.c
+++ b/mce-intel-skylake-xeon.c
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
-#include "ras-mce-handler.h"
 #include "bitfield.h"
+#include "ras-mce-handler.h"
 
 /* See IA32 SDM Vol3B Table 16-27 */
 

diff --git a/mce-intel-tulsa.c b/mce-intel-tulsa.c
index 7607e02cccb9dd3ee1ac58d6664991ae538c7399..ad9980454f2691ebfaee8b3b8184c37a320050c8 100644 (file)
--- a/mce-intel-tulsa.c
+++ b/mce-intel-tulsa.c
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
 
-#include "ras-mce-handler.h"
 #include "bitfield.h"
+#include "ras-mce-handler.h"
 
 /* See IA32 SDM Vol3B Appendix E.4.1 ff */
 

diff --git a/mce-intel.c b/mce-intel.c
index 58bcba3afbfcb5bb8d110531db36a7bc83ddfbef..bec84ec9405c3f33929fc2fe1068b421c36d6a88 100644 (file)
--- a/mce-intel.c
+++ b/mce-intel.c
@@ -21,15 +21,15 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <string.h>
 #include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
+#include <string.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
+#include "bitfield.h"
 #include "ras-logger.h"
 #include "ras-mce-handler.h"
-#include "bitfield.h"
 
 #define MCE_THERMAL_BANK       (MCE_EXTENDED_BANK + 0)
 #define MCE_TIMEOUT_BANK        (MCE_EXTENDED_BANK + 90)

diff --git a/non-standard-ampere.c b/non-standard-ampere.c
index b96e5c2f77f4c1ca8b62b819a893afe98b40d082..6f6e435a6b8e60d8993284d5b2d7beaa8d5e55d8 100644 (file)
--- a/non-standard-ampere.c
+++ b/non-standard-ampere.c
@@ -8,15 +8,16 @@
  *
  */
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>
-#include "types.h"
+
+#include "non-standard-ampere.h"
 #include "ras-logger.h"
-#include "ras-report.h"
 #include "ras-non-standard-handler.h"
-#include "non-standard-ampere.h"
+#include "ras-report.h"
+#include "types.h"
 
 /*Armv8 RAS compicant Error Record(APEI and BMC Reporting) Payload Type 0*/
 static const char * const disp_payload0_err_reg_name[] = {

diff --git a/non-standard-ampere.h b/non-standard-ampere.h
index 58c203a547bd1393efef6be7f07659edd8dae4ae..1e1a0fa96aaca4c42e763c45cfe08298d786beb0 100644 (file)
--- a/non-standard-ampere.h
+++ b/non-standard-ampere.h
@@ -11,9 +11,12 @@
 #ifndef __NON_STANDARD_AMPERE_H
 #define __NON_STANDARD_AMPERE_H
 
-#include "ras-events.h"
 #include <traceevent/event-parse.h>
 
+#include "types.h"
+
+struct ras_ns_ev_decoder;
+
 #define SOCKET_NUM(x) (((x) >> 14) & 0x3)
 #define PAYLOAD_TYPE(x) (((x) >> 6) & 0x3)
 #define TYPE(x) ((x) & 0x3f)

diff --git a/non-standard-hisi_hip08.c b/non-standard-hisi_hip08.c
index 4776832a2f44def59a3050df7275a42dab5ee477..853429683b318b2230490411a3990723483657f9 100644 (file)
--- a/non-standard-hisi_hip08.c
+++ b/non-standard-hisi_hip08.c
@@ -11,11 +11,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "types.h"
+
+#include "non-standard-hisilicon.h"
 #include "ras-logger.h"
-#include "ras-report.h"
 #include "ras-non-standard-handler.h"
-#include "non-standard-hisilicon.h"
+#include "ras-report.h"
+#include "types.h"
 
 /* HISI OEM error definitions */
 /* HISI OEM format1 error definitions */

diff --git a/non-standard-hisilicon.c b/non-standard-hisilicon.c
index 3d9fc30dbbd2fc1a7e329e8ef91eb95d791b87ef..b8cd4d0a130d05ac81e57de7cf806f54bc72f3ae 100644 (file)
--- a/non-standard-hisilicon.c
+++ b/non-standard-hisilicon.c
@@ -11,10 +11,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "types.h"
+
+#include "non-standard-hisilicon.h"
 #include "ras-logger.h"
 #include "ras-report.h"
-#include "non-standard-hisilicon.h"
+#include "types.h"
 
 #define HISI_BUF_LEN   2048
 #define HISI_PCIE_INFO_BUF_LEN 256

diff --git a/non-standard-hisilicon.h b/non-standard-hisilicon.h
index 75b911e8f88dbe3eebb1825330235f96c9accf5d..f39fabe0b8ba8b81a61afa93604dbc19a7b99319 100644 (file)
--- a/non-standard-hisilicon.h
+++ b/non-standard-hisilicon.h
@@ -11,8 +11,8 @@
 #ifndef __NON_STANDARD_HISILICON_H
 #define __NON_STANDARD_HISILICON_H
 
-#include "ras-non-standard-handler.h"
 #include "ras-mc-handler.h"
+#include "ras-non-standard-handler.h"
 
 #define HISI_SNPRINTF  mce_snprintf
 

diff --git a/non-standard-jaguarmicro.c b/non-standard-jaguarmicro.c
index 745b656425114acf88b822bcd2465231f8e6f492..76ba2a4d8ba9cd3ac1ead89c0eb6d957e4b4507e 100644 (file)
--- a/non-standard-jaguarmicro.c
+++ b/non-standard-jaguarmicro.c
@@ -8,16 +8,17 @@
  *
  */
 
+#include "non-standard-jaguarmicro.h"
+#include "ras-logger.h"
+#include "ras-mce-handler.h"
+#include "ras-non-standard-handler.h"
+#include "ras-report.h"
+#include "types.h"
+
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>
-#include "types.h"
-#include "ras-logger.h"
-#include "ras-report.h"
-#include "ras-non-standard-handler.h"
-#include "non-standard-jaguarmicro.h"
-#include "ras-mce-handler.h"
 
 #define JM_BUF_LEN     256
 #define JM_REG_BUF_LEN 2048

diff --git a/non-standard-jaguarmicro.h b/non-standard-jaguarmicro.h
index d5db73deaa038e3b8625bb603d007904da62d7c4..34c847aac913b5da3124f9452fc3ffdd068d8f00 100644 (file)
--- a/non-standard-jaguarmicro.h
+++ b/non-standard-jaguarmicro.h
@@ -11,8 +11,9 @@
 #ifndef __NON_STANDARD_JAGUAR_H
 #define __NON_STANDARD_JAGUAR_H
 
-#include "ras-events.h"
 #include <traceevent/event-parse.h>
+
+#include "ras-events.h"
 #include "ras-mce-handler.h"
 
 #define PAYLOAD_TYPE_0         0x00

diff --git a/non-standard-yitian.c b/non-standard-yitian.c
index d3dae38d461b8675f845cd02ac5e890a82d29fbf..3f1eeb20f7f9207a29efdba7efac2024b52941b6 100644 (file)
--- a/non-standard-yitian.c
+++ b/non-standard-yitian.c
@@ -8,15 +8,16 @@
  *
  */
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>
-#include "types.h"
+
+#include "non-standard-yitian.h"
 #include "ras-logger.h"
-#include "ras-report.h"
 #include "ras-non-standard-handler.h"
-#include "non-standard-yitian.h"
+#include "ras-report.h"
+#include "types.h"
 
 static const char * const yitian_ddr_payload_err_reg_name[] = {
        "Error Type:",

diff --git a/non-standard-yitian.h b/non-standard-yitian.h
index e4f9db8999c51de2a225e391c3a81ae2217612ca..9f5af72e745d9c0d5a686871fa07ae21357407a0 100644 (file)
--- a/non-standard-yitian.h
+++ b/non-standard-yitian.h
@@ -14,6 +14,8 @@
 #include "ras-events.h"
 #include "traceevent/event-parse.h"
 
+struct ras_ns_ev_decoder;
+
 #define YITIAN_RAS_TYPE_DDR            0x50
 
 struct yitian_payload_header {

diff --git a/queue.c b/queue.c
index 913439421085f2724191ea47143a16ecb9c1badb..655ccd80b1d63922ba70c62da301fc084a2c32fe 100644 (file)
--- a/queue.c
+++ b/queue.c
@@ -11,8 +11,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+
 #include <stdio.h>
 #include <stdlib.h>
+
 #include "queue.h"
 #include "ras-logger.h"
 

diff --git a/ras-aer-handler.c b/ras-aer-handler.c
index 8cfc663e7f5d0e22e177437722f3de3a5c88b6dc..138abe2e487418c2b92cabd29a9ce2479ddff883 100644 (file)
--- a/ras-aer-handler.c
+++ b/ras-aer-handler.c
@@ -15,16 +15,18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <traceevent/kbuffer.h>
+#include <unistd.h>
+
+#include "bitfield.h"
 #include "ras-aer-handler.h"
-#include "types.h"
 #include "ras-logger.h"
-#include "bitfield.h"
 #include "ras-report.h"
+#include "types.h"
 
 /* bit field meaning for correctable error */
 static const char *aer_cor_errors[32] = {

diff --git a/ras-aer-handler.h b/ras-aer-handler.h
index cb995502727e58a17378a865bccc1db219048b25..0b483a51bfaa6a6af1c1d8495a7032010234928b 100644 (file)
--- a/ras-aer-handler.h
+++ b/ras-aer-handler.h
@@ -19,9 +19,10 @@
 #ifndef __RAS_AER_HANDLER_H
 #define __RAS_AER_HANDLER_H
 
-#include "ras-events.h"
 #include <traceevent/event-parse.h>
 
+#include "ras-events.h"
+
 int ras_aer_event_handler(struct trace_seq *s,
                          struct tep_record *record,
                          struct tep_event *event, void *context);

diff --git a/ras-arm-handler.c b/ras-arm-handler.c
index 1267187a30aafc7c53f4353cc191062be4bc46b3..c09094373af77e9e616ea1a53194e65cae3667fa 100644 (file)
--- a/ras-arm-handler.c
+++ b/ras-arm-handler.c
@@ -14,15 +14,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <traceevent/kbuffer.h>
+#include <unistd.h>
+
+#include "non-standard-ampere.h"
 #include "ras-arm-handler.h"
-#include "types.h"
+#include "ras-cpu-isolation.h"
 #include "ras-logger.h"
-#include "ras-report.h"
 #include "ras-non-standard-handler.h"
-#include "non-standard-ampere.h"
-#include "ras-cpu-isolation.h"
+#include "ras-report.h"
+#include "types.h"
 
 #define ARM_ERR_VALID_ERROR_COUNT BIT(0)
 #define ARM_ERR_VALID_FLAGS BIT(1)

diff --git a/ras-arm-handler.h b/ras-arm-handler.h
index 5b2fd47b1d4bc277fbdd8c1ed5a9c657846acf7c..c2499ea6977e17f605d2c305a95a3948956235bc 100644 (file)
--- a/ras-arm-handler.h
+++ b/ras-arm-handler.h
@@ -14,9 +14,10 @@
 #ifndef __RAS_ARM_HANDLER_H
 #define __RAS_ARM_HANDLER_H
 
-#include "ras-events.h"
 #include <traceevent/event-parse.h>
 
+#include "ras-events.h"
+
 /*
  * ARM Processor Error Information Structure, According to
  * UEFI_2_9 specification chapter N2.4.4.

diff --git a/ras-cpu-isolation.c b/ras-cpu-isolation.c
index e551c61bdf270170eca7200ff0631009a9a0b215..0daa63a6ac65ccca7d7de258fc45efba71640d87 100644 (file)
--- a/ras-cpu-isolation.c
+++ b/ras-cpu-isolation.c
@@ -15,13 +15,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>
-#include <errno.h>
 #include <unistd.h>
-#include <limits.h>
+
 #include <ctype.h>
-#include "ras-logger.h"
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
 #include "ras-cpu-isolation.h"
+#include "ras-logger.h"
 
 #define SECOND_OF_MON (30 * 24 * 60 * 60)
 #define SECOND_OF_DAY (24 * 60 * 60)

diff --git a/ras-cxl-handler.c b/ras-cxl-handler.c
index 02942bd38a2bede6cfeff9c81a08ff42ffc4fee6..dd3cfeb0439d813ddcaab613f0bb3e486e5d9da4 100644 (file)
--- a/ras-cxl-handler.c
+++ b/ras-cxl-handler.c
@@ -12,17 +12,18 @@
  * GNU General Public License for more details.
  */
 
+#include <endian.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <traceevent/kbuffer.h>
+#include <unistd.h>
+
 #include "ras-cxl-handler.h"
-#include "types.h"
 #include "ras-logger.h"
 #include "ras-record.h"
 #include "ras-report.h"
-#include <endian.h>
+#include "types.h"
 
 /* Common Functions */
 static void convert_timestamp(unsigned long long ts, char *ts_ptr, uint16_t size)

diff --git a/ras-cxl-handler.h b/ras-cxl-handler.h
index 1ea0f934a640064eb62051a380cc57cf879dec8c..5495f0d8646989d43f7911c87ee327900b7261fe 100644 (file)
--- a/ras-cxl-handler.h
+++ b/ras-cxl-handler.h
@@ -15,9 +15,10 @@
 #ifndef __RAS_CXL_HANDLER_H
 #define __RAS_CXL_HANDLER_H
 
-#include "ras-events.h"
 #include <traceevent/event-parse.h>
 
+#include "ras-events.h"
+
 int ras_cxl_poison_event_handler(struct trace_seq *s,
                                 struct tep_record *record,
                                 struct tep_event *event, void *context);

diff --git a/ras-devlink-handler.c b/ras-devlink-handler.c
index dfe22722ab08bee7498570d857279f2744a43a68..e27552191c5fc2c407adfcb30c918da914e15a7b 100644 (file)
--- a/ras-devlink-handler.c
+++ b/ras-devlink-handler.c
@@ -20,12 +20,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <traceevent/kbuffer.h>
+#include <unistd.h>
+
 #include "ras-devlink-handler.h"
-#include "types.h"
 #include "ras-logger.h"
 #include "ras-report.h"
+#include "types.h"
 
 int ras_net_xmit_timeout_handler(struct trace_seq *s,
                                 struct tep_record *record,

diff --git a/ras-devlink-handler.h b/ras-devlink-handler.h
index ccda865b6937806184016707f3224430596f6e5c..a759ec14c65e5e397397adfc540bb07d4c2aaf35 100644 (file)
--- a/ras-devlink-handler.h
+++ b/ras-devlink-handler.h
@@ -19,9 +19,10 @@
 #ifndef __RAS_DEVLINK_HANDLER_H
 #define __RAS_DEVLINK_HANDLER_H
 
-#include "ras-events.h"
 #include <traceevent/event-parse.h>
 
+#include "ras-events.h"
+
 int ras_net_xmit_timeout_handler(struct trace_seq *s,
                                 struct tep_record *record,
                                 struct tep_event *event, void *context);

diff --git a/ras-diskerror-handler.c b/ras-diskerror-handler.c
index 527f7dd788f6ae3dc386436ec80c488850c55203..cf9cef0849de768ae5dd2fb7911cf24954070350 100644 (file)
--- a/ras-diskerror-handler.c
+++ b/ras-diskerror-handler.c
@@ -17,19 +17,21 @@
  */
 
 #define _GNU_SOURCE
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifndef __dev_t_defined
-#include <sys/types.h>
-#endif /* __dev_t_defined */
 #include <string.h>
-#include <errno.h>
 #include <sys/sysmacros.h>
 #include <traceevent/kbuffer.h>
+
 #include "ras-diskerror-handler.h"
-#include "types.h"
 #include "ras-logger.h"
 #include "ras-report.h"
+#include "types.h"
+
+#ifndef __dev_t_defined
+#include <sys/types.h>
+#endif /* __dev_t_defined */
 
 static const struct {
        int             error;

diff --git a/ras-diskerror-handler.h b/ras-diskerror-handler.h
index 5f86a9eaeab2bad2132960ca13c5f3585da4bd4a..9581b3829b758249c367fa2cf7c53a0bd61e144c 100644 (file)
--- a/ras-diskerror-handler.h
+++ b/ras-diskerror-handler.h
@@ -19,9 +19,10 @@
 #ifndef __RAS_DISKERROR_HANDLER_H
 #define __RAS_DISKERROR_HANDLER_H
 
-#include "ras-events.h"
 #include <traceevent/event-parse.h>
 
+#include "ras-events.h"
+
 int ras_diskerror_event_handler(struct trace_seq *s,
                                struct tep_record *record,
                                struct tep_event *event, void *context);

diff --git a/ras-events.c b/ras-events.c
index a2a37738c72e58b1df6eb1736e719bbc02d24e47..29056446fa053d57e4737288f1444083e410fb90 100644 (file)
--- a/ras-events.c
+++ b/ras-events.c
@@ -38,6 +38,7 @@
 #include "ras-cxl-handler.h"
 #include "ras-devlink-handler.h"
 #include "ras-diskerror-handler.h"
+#include "ras-events.h"
 #include "ras-extlog-handler.h"
 #include "ras-logger.h"
 #include "ras-mce-handler.h"
@@ -45,7 +46,6 @@
 #include "ras-memory-failure-handler.h"
 #include "ras-non-standard-handler.h"
 #include "ras-page-isolation.h"
-#include "ras-events.h"
 #include "ras-record.h"
 #include "trigger.h"
 

diff --git a/ras-extlog-handler.c b/ras-extlog-handler.c
index ba48f1165f91a398ff602ca4c2dda142e04a3883..8b5680fc8d8026a57286523dbfeee9617c6818b7 100644 (file)
--- a/ras-extlog-handler.c
+++ b/ras-extlog-handler.c
@@ -22,13 +22,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <traceevent/kbuffer.h>
+#include <unistd.h>
 
 #include "ras-extlog-handler.h"
 #include "ras-logger.h"
-#include "types.h"
 #include "ras-report.h"
+#include "types.h"
 
 static char *err_type(int etype)
 {

diff --git a/ras-extlog-handler.h b/ras-extlog-handler.h
index d9a7b1d543baf3a9c86760ac6112c637a22d4f63..92f5c65b8fa7f9b9049965902bb5b3378cb83737 100644 (file)
--- a/ras-extlog-handler.h
+++ b/ras-extlog-handler.h
@@ -20,9 +20,9 @@
 #define __RAS_EXTLOG_HANDLER_H
 
 #include <stdint.h>
+#include <traceevent/event-parse.h>
 
 #include "ras-events.h"
-#include <traceevent/event-parse.h>
 
 int ras_extlog_mem_event_handler(struct trace_seq *s,
                                 struct tep_record *record,

diff --git a/ras-mc-handler.c b/ras-mc-handler.c
index 74d88509a47ee96426aa2919658a96cf9fe941ee..00d98433fd808e69b936529ecce165d056b0236a 100644 (file)
--- a/ras-mc-handler.c
+++ b/ras-mc-handler.c
@@ -24,12 +24,12 @@
 #include <traceevent/kbuffer.h>
 #include <unistd.h>
 
-#include "ras-mc-handler.h"
 #include "ras-logger.h"
+#include "ras-mc-handler.h"
 #include "ras-page-isolation.h"
-#include "types.h"
 #include "ras-report.h"
 #include "trigger.h"
+#include "types.h"
 
 #define MAX_ENV 30
 static const char *mc_ce_trigger = NULL;

diff --git a/ras-mc-handler.h b/ras-mc-handler.h
index c39fee3af3b5bda05b1714032ba04f256e5ed1ac..72b3c2a1af449893a4da2f887b09d34e43ab1de0 100644 (file)
--- a/ras-mc-handler.h
+++ b/ras-mc-handler.h
@@ -19,9 +19,10 @@
 #ifndef __RAS_MC_HANDLER_H
 #define __RAS_MC_HANDLER_H
 
-#include "ras-events.h"
 #include <traceevent/event-parse.h>
 
+#include "ras-events.h"
+
 void mc_event_trigger_setup(void);
 
 int ras_mc_event_handler(struct trace_seq *s,

diff --git a/ras-mce-handler.c b/ras-mce-handler.c
index aaf766f70c077a7d885323082874a1ab67ed90d1..fe499851850a8e983d3069158b3db7829ab86884 100644 (file)
--- a/ras-mce-handler.c
+++ b/ras-mce-handler.c
@@ -18,17 +18,17 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <stdint.h>
 #include <traceevent/kbuffer.h>
+#include <unistd.h>
 
-#include "ras-mce-handler.h"
-#include "types.h"
 #include "ras-logger.h"
+#include "ras-mce-handler.h"
 #include "ras-report.h"
+#include "types.h"
 
 /*
  * The code below were adapted from Andi Kleen/Intel/SuSe mcelog code,

diff --git a/ras-mce-handler.h b/ras-mce-handler.h
index 74d913a5ae2c5736f0cf2ad35d7dbc45753ba794..21818a46f32ba2f7229e7ffdb9c15c9a1404d0cd 100644 (file)
--- a/ras-mce-handler.h
+++ b/ras-mce-handler.h
@@ -20,9 +20,9 @@
 #define __RAS_MCE_HANDLER_H
 
 #include <stdint.h>
+#include <traceevent/event-parse.h>
 
 #include "ras-events.h"
-#include <traceevent/event-parse.h>
 
 enum cputype {
        CPU_GENERIC,

diff --git a/ras-memory-failure-handler.c b/ras-memory-failure-handler.c
index a93b03415f74a6f165db6e8160c29c9867a585af..1a4d17ae2ae7def0f056a2785c443293d88a08c3 100644 (file)
--- a/ras-memory-failure-handler.c
+++ b/ras-memory-failure-handler.c
@@ -19,9 +19,9 @@
 
 #include "ras-logger.h"
 #include "ras-memory-failure-handler.h"
-#include "types.h"
 #include "ras-report.h"
 #include "trigger.h"
+#include "types.h"
 
 /* Memory failure - various types of pages */
 enum mf_action_page_type {

diff --git a/ras-memory-failure-handler.h b/ras-memory-failure-handler.h
index e299eae4b0f0065faed40d95885bdb55dcc56054..217f1569b30291fbe5fe721bea646721464ff084 100644 (file)
--- a/ras-memory-failure-handler.h
+++ b/ras-memory-failure-handler.h
@@ -15,9 +15,10 @@
 #ifndef __RAS_MEMORY_FAILURE_HANDLER_H
 #define __RAS_MEMORY_FAILURE_HANDLER_H
 
-#include "ras-events.h"
 #include <traceevent/event-parse.h>
 
+#include "ras-events.h"
+
 void mem_fail_event_trigger_setup(void);
 int ras_memory_failure_event_handler(struct trace_seq *s,
                                     struct tep_record *record,

diff --git a/ras-non-standard-handler.c b/ras-non-standard-handler.c
index 887ab146d9c44cbfb520e3ebff2302d4b4072b5b..7d3ceccd98c7ec3a09f97bf161111848b0f1f4df 100644 (file)
--- a/ras-non-standard-handler.c
+++ b/ras-non-standard-handler.c
@@ -11,16 +11,17 @@
  * GNU General Public License for more details.
  */
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
 #include <string.h>
-#include <unistd.h>
 #include <traceevent/kbuffer.h>
-#include "ras-non-standard-handler.h"
-#include "types.h"
+#include <unistd.h>
+
 #include "ras-logger.h"
+#include "ras-non-standard-handler.h"
 #include "ras-report.h"
+#include "types.h"
 
 static struct  ras_ns_ev_decoder *ras_ns_ev_dec_list;
 

diff --git a/ras-non-standard-handler.h b/ras-non-standard-handler.h
index 5c6746db774c82b349a0646a9754a7d3ebdfd697..3b7302b467cd28e12899d5b1b00588c34b31e1d7 100644 (file)
--- a/ras-non-standard-handler.h
+++ b/ras-non-standard-handler.h
@@ -14,9 +14,14 @@
 #ifndef __RAS_NON_STANDARD_HANDLER_H
 #define __RAS_NON_STANDARD_HANDLER_H
 
+#include <traceevent/event-parse.h>
+
 #include "ras-events.h"
 #include "ras-record.h"
-#include <traceevent/event-parse.h>
+
+#ifdef HAVE_SQLITE3
+#include <sqlite3.h>
+#endif
 
 struct ras_ns_ev_decoder {
        struct ras_ns_ev_decoder *next;
@@ -26,7 +31,6 @@ struct ras_ns_ev_decoder {
        int (*decode)(struct ras_events *ras, struct ras_ns_ev_decoder *ev_decoder,
                      struct trace_seq *s, struct ras_non_standard_event *event);
 #ifdef HAVE_SQLITE3
-#include <sqlite3.h>
        sqlite3_stmt *stmt_dec_record;
 #endif
 };

diff --git a/ras-page-isolation.c b/ras-page-isolation.c
index fcf3048d71a37f7d7a8cf48a3662499698b78d7e..058949260c04a74e9e1682575a257bf6a72eb278 100644 (file)
--- a/ras-page-isolation.c
+++ b/ras-page-isolation.c
@@ -16,8 +16,8 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 

diff --git a/ras-page-isolation.h b/ras-page-isolation.h
index 7da68c0e7777f628615e828096488150501cc259..36c21a18943f33f373df5859d88997125bdee3bf 100644 (file)
--- a/ras-page-isolation.h
+++ b/ras-page-isolation.h
@@ -18,8 +18,8 @@
 #include <stdbool.h>
 #include <time.h>
 
-#include "types.h"
 #include "rbtree.h"
+#include "types.h"
 
 #define PAGE_SHIFT             12
 #define PAGE_SIZE              BIT(PAGE_SHIFT)

diff --git a/ras-record.c b/ras-record.c
index e3631377f794878bde94ae1a5e085c56df6a507b..ed5bd48291e713a7c390905750d78d30fe248da0 100644 (file)
--- a/ras-record.c
+++ b/ras-record.c
@@ -17,22 +17,23 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/*
- * BuildRequires: sqlite-devel
- */
-
-#include <string.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
+#include <string.h>
 #include <sys/stat.h>
-#include "ras-events.h"
-#include "ras-record.h"
-#include "ras-mc-handler.h"
+#include <unistd.h>
+
 #include "ras-aer-handler.h"
-#include "ras-mce-handler.h"
+#include "ras-events.h"
 #include "ras-logger.h"
+#include "ras-mce-handler.h"
+#include "ras-mc-handler.h"
+#include "ras-record.h"
+
+/*
+ * BuildRequires: sqlite-devel
+ */
 
 /* #define DEBUG_SQL 1 */
 

diff --git a/ras-record.h b/ras-record.h
index 27e484b43f9e588996a6f1c6679c3a4c4ec72877..3fe332e791365c6e2575c52d6108377f6e566239 100644 (file)
--- a/ras-record.h
+++ b/ras-record.h
@@ -20,8 +20,10 @@
 #ifndef __RAS_RECORD_H
 #define __RAS_RECORD_H
 
-#include <stdint.h>
+#include <sqlite3.h>
 #include <stdbool.h>
+#include <stdint.h>
+
 #include "config.h"
 #include "types.h"
 
@@ -261,7 +263,6 @@ struct ras_cxl_memory_module_event;
 
 #ifdef HAVE_SQLITE3
 
-#include <sqlite3.h>
 
 struct sqlite3_priv {
        sqlite3         *db;

diff --git a/ras-report.c b/ras-report.c
index cf841ec9e38c7a39a21d4926129e94e72c41d033..d7759cb4a366d9f220f719fdafffd7dd4d2a9927 100644 (file)
--- a/ras-report.c
+++ b/ras-report.c
@@ -13,11 +13,11 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/utsname.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <sys/un.h>
+#include <sys/utsname.h>
+#include <unistd.h>
 
 #include "ras-report.h"
 

diff --git a/ras-report.h b/ras-report.h
index 0c6644697820f88443dea7b1fa00ad469694b6bb..8c2168b9ed884a31f342b0ff545604313679ec7a 100644 (file)
--- a/ras-report.h
+++ b/ras-report.h
@@ -14,12 +14,12 @@
 #ifndef __RAS_REPORT_H
 #define __RAS_REPORT_H
 
-#include "types.h"
+#include "ras-aer-handler.h"
 #include "ras-events.h"
-#include "ras-record.h"
-#include "ras-mc-handler.h"
 #include "ras-mce-handler.h"
-#include "ras-aer-handler.h"
+#include "ras-mc-handler.h"
+#include "ras-record.h"
+#include "types.h"
 
 /* Maximal length of backtrace. */
 #define MAX_BACKTRACE_SIZE (1024 * 1024)

diff --git a/rasdaemon.c b/rasdaemon.c
index 6f3a2723ff6196ace6bd79ac5b8d76ebafab3e54..79b1605b4642034aad65d48974bd886dcd3ddaea 100644 (file)
--- a/rasdaemon.c
+++ b/rasdaemon.c
@@ -22,10 +22,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "types.h"
-#include "ras-logger.h"
 #include "ras-events.h"
+#include "ras-logger.h"
 #include "ras-record.h"
+#include "types.h"
 
 /*
  * Arguments(argp) handling logic and main

diff --git a/trigger.c b/trigger.c
index 3031f4b010e35798372b4c62840c27a80ccfb112..113ac04e13a34e2c4739398001bf1e7c3d61b466 100644 (file)
--- a/trigger.c
+++ b/trigger.c
@@ -1,8 +1,9 @@
 #define _GNU_SOURCE
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <sys/wait.h>
+#include <unistd.h>
+
 #include "ras-logger.h"
 #include "trigger.h"