From e2d59e2cb9063e175760a4eca3384e2eedbd3fbe Mon Sep 17 00:00:00 2001
From: Balazs Gerofi <bgerofi@riken.jp>
Date: Fri, 10 Feb 2017 07:41:53 +0900
Subject: [PATCH] mcreboot-smp: introduction of ikc_irq_start argument

---
 arch/x86/tools/mcreboot-smp-x86.sh.in | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/arch/x86/tools/mcreboot-smp-x86.sh.in b/arch/x86/tools/mcreboot-smp-x86.sh.in
index f76b0b86..83bb9217 100644
--- a/arch/x86/tools/mcreboot-smp-x86.sh.in
+++ b/arch/x86/tools/mcreboot-smp-x86.sh.in
@@ -41,8 +41,9 @@ else
 fi
 
 turbo=""
+ihk_irq=""
 
-while getopts :ti:k:c:m:o:f:r: OPT
+while getopts :ti:k:c:m:o:f:r:q: OPT
 do
 	case ${OPT} in
 	f)	facility=${OPTARG}
@@ -81,6 +82,8 @@ do
 		;;
 	r) ikc_map=${OPTARG}
 		;;
+	q) ihk_irq=${OPTARG}
+		;;
 	t) turbo="turbo"
 		;;
 	*)  echo "invalid option -${OPT}" >&2
@@ -304,16 +307,17 @@ sync
 
 # Load IHK-SMP if not loaded and reserve CPUs and memory
 if ! grep ihk_smp_x86 /proc/modules &>/dev/null; then
-	ihk_irq=""
-	for i in `seq 64 255`; do
-		if [ ! -d /proc/irq/$i ] && [ "`cat /proc/interrupts | grep ":" | awk '{print $1}' | grep -o '[0-9]*' | grep -e '^$i$'`" == "" ]; then
-			ihk_irq=$i
-			break
-		fi
-	done
 	if [ "$ihk_irq" == "" ]; then
-		echo "error: no IRQ available" >&2
-		error_exit "ihk_loaded"
+		for i in `seq 64 255`; do
+			if [ ! -d /proc/irq/$i ] && [ "`cat /proc/interrupts | grep ":" | awk '{print $1}' | grep -o '[0-9]*' | grep -e '^$i$'`" == "" ]; then
+				ihk_irq=$i
+				break
+			fi
+		done
+		if [ "$ihk_irq" == "" ]; then
+			echo "error: no IRQ available" >&2
+			error_exit "ihk_loaded"
+		fi
 	fi
 	if ! insmod ${KMODDIR}/ihk-smp-x86.ko ihk_start_irq=$ihk_irq ihk_ikc_irq_core=$ihk_ikc_irq_core 2>/dev/null; then
 		echo "error: loading ihk-smp-x86" >&2