From a87884aabba198a1d44e22f89c5477f1b8167ffd Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Sat, 28 Sep 2013 04:11:59 +0930 Subject: [PATCH] cpuid: ccanlint fixes. Signed-off-by: Rusty Russell --- ccan/cpuid/BSD-MIT | 1 - ccan/cpuid/LICENSE | 1 + ccan/cpuid/_info | 5 +++-- ccan/cpuid/cpuid.h | 2 +- ccan/cpuid/test/run.c | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) delete mode 120000 ccan/cpuid/BSD-MIT create mode 100644 ccan/cpuid/LICENSE diff --git a/ccan/cpuid/BSD-MIT b/ccan/cpuid/BSD-MIT deleted file mode 120000 index 2354d129..00000000 --- a/ccan/cpuid/BSD-MIT +++ /dev/null @@ -1 +0,0 @@ -../../licenses/BSD-MIT \ No newline at end of file diff --git a/ccan/cpuid/LICENSE b/ccan/cpuid/LICENSE new file mode 100644 index 00000000..2354d129 --- /dev/null +++ b/ccan/cpuid/LICENSE @@ -0,0 +1 @@ +../../licenses/BSD-MIT \ No newline at end of file diff --git a/ccan/cpuid/_info b/ccan/cpuid/_info index 1603b4be..569dc21c 100644 --- a/ccan/cpuid/_info +++ b/ccan/cpuid/_info @@ -8,10 +8,11 @@ * * Example: * #include + * #include * - * int main() + * int main(void) * { - * int highest; + * uint32_t highest; * cpuid(CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED, &highest); * printf ("Highest extended function supported: %d\n", highest); * diff --git a/ccan/cpuid/cpuid.h b/ccan/cpuid/cpuid.h index 305d69aa..0a9fc9d9 100644 --- a/ccan/cpuid/cpuid.h +++ b/ccan/cpuid/cpuid.h @@ -69,7 +69,7 @@ typedef enum cpuid { CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED = 0x80000000, CPU_EXTENDED_PROC_INFO_FEATURE_BITS = 0x80000001, - CPU_PROC_BRAND_STRING = 0x80000002, + CPU_PROC_BRAND_STRING = 0x80000002, CPU_L1_CACHE_AND_TLB_IDS = 0x80000005, CPU_EXTENDED_L2_CACHE_FEATURES = 0x80000006, CPU_ADV_POWER_MGT_INFO = 0x80000007, diff --git a/ccan/cpuid/test/run.c b/ccan/cpuid/test/run.c index c96f3ab8..c77fd25f 100644 --- a/ccan/cpuid/test/run.c +++ b/ccan/cpuid/test/run.c @@ -1,9 +1,9 @@ -#include "cpuid.h" +#include "../cpuid.c" #include #include -int main() +int main(void) { if (!cpuid_is_supported()) { printf ("CPUID instruction is not supported by this CPU\n"); -- 2.39.2