On 05/01/2012 07:45 PM, Frank Rowand wrote:
> The '-a' option is always ignored if --smp or --numa is specified. Fix the
> warning message to not depend on --smp or --numa occuring first.
>
> Signed-off-by: Frank Rowand <frank.rowand@xxxxxxxxxxx>
Compiled and tested on qemuarm UP. Behaved as expected with --smp --numa
(not built-in) and -a alone.
Tested-by: Darren Hart <dvhart@xxxxxxxxxxxxxxx>
> ---
> src/cyclictest/cyclictest.c | 14 11 + 3 - 0 !
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
> Index: b/src/cyclictest/cyclictest.c
> ===================================================================
> --- a/src/cyclictest/cyclictest.c
> +++ b/src/cyclictest/cyclictest.c
> @@ -949,6 +949,7 @@ static char *policyname(int policy)
> static void process_options (int argc, char *argv[])
> {
> int error = 0;
> + int option_affinity = 0;
> int max_cpus = sysconf(_SC_NPROCESSORS_CONF);
> struct rlimit rlim;
>
> @@ -1000,10 +1001,9 @@ static void process_options (int argc, c
> break;
> switch (c) {
> case 'a':
> - if (smp) {
> - warn("-a ignored due to --smp\n");
> + option_affinity = 1;
> + if (smp || numa)
> break;
> - }
> if (optarg != NULL) {
> affinity = atoi(optarg);
> setaffinity = AFFINITY_SPECIFIED;
> @@ -1112,6 +1112,14 @@ static void process_options (int argc, c
> }
> }
>
> + if (option_affinity) {
> + if (smp) {
> + warn("-a ignored due to --smp\n");
> + } else if (numa) {
> + warn("-a ignored due to --numa\n");
> + }
> + }
> +
> if (setaffinity == AFFINITY_SPECIFIED) {
> if (affinity < 0)
> error = 1;
>
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
