Merge commit 'linux-2.6/master' (early part) into oprofile/core

This branch depends on these apic patches:

      apic, x86: Use BIOS settings for IBS and MCE threshold interrupt LVT offsets
      apic, x86: Check if EILVT APIC registers are available (AMD only)

Signed-off-by: Robert Richter <robert.richter@amd.com>

1 files changed, 14 insertions, 3 deletions

diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index c668b447c725..7556315c1978 100644
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -768,8 +768,10 @@ static bool tomoyo_select_one(struct tomoyo_io_buffer *head, const char *data)
                 return true; /* Do nothing if open(O_WRONLY). */
         memset(&head->r, 0, sizeof(head->r));
         head->r.print_this_domain_only = true;
-        head->r.eof = !domain;
-        head->r.domain = &domain->list;
+        if (domain)
+                head->r.domain = &domain->list;
+        else
+                head->r.eof = 1;
         tomoyo_io_printf(head, "# select %s\n", data);
         if (domain && domain->is_deleted)
                 tomoyo_io_printf(head, "# This is a deleted domain.\n");
@@ -2051,13 +2053,22 @@ void tomoyo_check_profile(void)
                 const u8 profile = domain->profile;
                 if (tomoyo_profile_ptr[profile])
                         continue;
+                printk(KERN_ERR "You need to define profile %u before using it.\n",
+                       profile);
+                printk(KERN_ERR "Please see http://tomoyo.sourceforge.jp/2.3/ "
+                       "for more information.\n");
                 panic("Profile %u (used by '%s') not defined.\n",
                       profile, domain->domainname->name);
         }
         tomoyo_read_unlock(idx);
-        if (tomoyo_profile_version != 20090903)
+        if (tomoyo_profile_version != 20090903) {
+                printk(KERN_ERR "You need to install userland programs for "
+                       "TOMOYO 2.3 and initialize policy configuration.\n");
+                printk(KERN_ERR "Please see http://tomoyo.sourceforge.jp/2.3/ "
+                       "for more information.\n");
                 panic("Profile version %u is not supported.\n",
                       tomoyo_profile_version);
+        }
         printk(KERN_INFO "TOMOYO: 2.3.0\n");
         printk(KERN_INFO "Mandatory Access Control activated.\n");
 }