changeset 1:9934e5e0bbd7

ckpt
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Mon, 25 Jul 2011 03:57:07 +0100
parents 1f6f95793da4
children 71260a2d157b
files lx-fixes
diffstat 1 files changed, 61 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lx-fixes	Mon Jul 25 03:56:14 2011 +0100
+++ b/lx-fixes	Mon Jul 25 03:57:07 2011 +0100
@@ -1,6 +1,6 @@
-diff -r baa5e56a424f -r ca3807f4a2e3 usr/src/lib/brand/lx/lx_brand/common/lx_brand.c
+diff -r baa5e56a424f usr/src/lib/brand/lx/lx_brand/common/lx_brand.c
 --- a/usr/src/lib/brand/lx/lx_brand/common/lx_brand.c	Sun Jul 24 00:41:06 2011 +0100
-+++ b/usr/src/lib/brand/lx/lx_brand/common/lx_brand.c	Mon Jul 25 03:02:27 2011 +0100
++++ b/usr/src/lib/brand/lx/lx_brand/common/lx_brand.c	Mon Jul 25 03:56:56 2011 +0100
 @@ -625,8 +625,6 @@
  	(void) close(fd_new);
  }
@@ -25,9 +25,9 @@
  
  	stack_bottom = 2 * sysconf(_SC_PAGESIZE);
  
-diff -r baa5e56a424f -r ca3807f4a2e3 usr/src/lib/brand/lx/lx_support/lx_support.c
+diff -r baa5e56a424f usr/src/lib/brand/lx/lx_support/lx_support.c
 --- a/usr/src/lib/brand/lx/lx_support/lx_support.c	Sun Jul 24 00:41:06 2011 +0100
-+++ b/usr/src/lib/brand/lx/lx_support/lx_support.c	Mon Jul 25 03:02:27 2011 +0100
++++ b/usr/src/lib/brand/lx/lx_support/lx_support.c	Mon Jul 25 03:56:56 2011 +0100
 @@ -455,20 +455,6 @@
  	}
  
@@ -49,3 +49,60 @@
  	 * Check to see whether the zone has any ZFS datasets configured.
  	 */
  	if (zonecfg_setdsent(handle) != Z_OK) {
+diff -r baa5e56a424f usr/src/uts/common/brand/lx/procfs/lx_prvfsops.c
+--- a/usr/src/uts/common/brand/lx/procfs/lx_prvfsops.c	Sun Jul 24 00:41:06 2011 +0100
++++ b/usr/src/uts/common/brand/lx/procfs/lx_prvfsops.c	Mon Jul 25 03:56:56 2011 +0100
+@@ -223,7 +223,7 @@
+ 	/*
+ 	 * Having the resource be anything but "lxproc" doesn't make sense
+ 	 */
+-	vfs_setresource(vfsp, "lxproc");
++	vfs_setresource(vfsp, "lxproc", 0);
+ 
+ 	lxpr_mnt = kmem_alloc(sizeof (*lxpr_mnt), KM_SLEEP);
+ 
+diff -r baa5e56a424f usr/src/uts/common/brand/lx/procfs/lx_prvnops.c
+--- a/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c	Sun Jul 24 00:41:06 2011 +0100
++++ b/usr/src/uts/common/brand/lx/procfs/lx_prvnops.c	Mon Jul 25 03:56:56 2011 +0100
+@@ -1927,7 +1927,7 @@
+ 		lxpr_uiobuf_printf(uiobuf, "cache size\t: %u KB\n",
+ 		    getl2cacheinfo(cp, NULL, NULL, NULL) / 1024);
+ 
+-		if (x86_feature & X86_HTT) {
++		if (is_x86_feature(x86_featureset, X86FSET_HTT)) {
+ 			/*
+ 			 * 'siblings' is used for HT-style threads
+ 			 */
+diff -r baa5e56a424f usr/src/uts/common/os/pid.c
+--- a/usr/src/uts/common/os/pid.c	Sun Jul 24 00:41:06 2011 +0100
++++ b/usr/src/uts/common/os/pid.c	Mon Jul 25 03:56:56 2011 +0100
+@@ -112,6 +112,18 @@
+ 	return (pidp);
+ }
+ 
++struct pid *
++pid_find(pid_t pid)
++{
++	struct pid *pidp;
++
++	mutex_enter(&pidlinklock);
++	pidp = pid_lookup(pid);
++	mutex_exit(&pidlinklock);
++
++	return (pidp);
++}
++
+ void
+ pid_setmin(void)
+ {
+diff -r baa5e56a424f usr/src/uts/common/sys/proc.h
+--- a/usr/src/uts/common/sys/proc.h	Sun Jul 24 00:41:06 2011 +0100
++++ b/usr/src/uts/common/sys/proc.h	Mon Jul 25 03:56:56 2011 +0100
+@@ -623,6 +623,7 @@
+ 
+ extern void pid_setmin(void);
+ extern pid_t pid_allocate(proc_t *, pid_t, int);
++extern struct pid *pid_find(pid_t);
+ extern int pid_rele(struct pid *);
+ extern void pid_exit(proc_t *, struct task *);
+ extern void proc_entry_free(struct pid *);