From: BVK Chaitanya <bvk@dbook>
Date: Sat, 4 Sep 2010 15:32:48 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~596^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fcd1ee541b86a0c3e1bd1d3528c78b1e261ecfb;p=thirdparty%2Fgrub.git

merge with mainline
---

9fcd1ee541b86a0c3e1bd1d3528c78b1e261ecfb
diff --cc grub-core/script/execute.c
index 3962b6ba5,88057d44e..ceda6f9c5
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@@ -34,10 -34,11 +34,14 @@@
  static unsigned long is_continue;
  static unsigned long active_loops;
  static unsigned long active_breaks;
+ static unsigned long function_return;
+ 
+ #define GRUB_SCRIPT_SCOPE_MALLOCED      1
+ #define GRUB_SCRIPT_SCOPE_ARGS_MALLOCED 2
  
 +#define GRUB_SCRIPT_SCOPE_MALLOCED      1
 +#define GRUB_SCRIPT_SCOPE_ARGS_MALLOCED 2
 +
  /* Scope for grub script functions.  */
  struct grub_script_scope
  {