PERFORCE change 176456 for review
Ana Kukec
anchie at FreeBSD.org
Fri Apr 2 15:06:32 UTC 2010
http://p4web.freebsd.org/chv.cgi?CH=176456
Change 176456 by anchie at anchie_malimis on 2010/04/02 15:05:36
IFC @176455
Affected files ...
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/pmc_mdep.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/mv_sata.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/cam_xpt.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/cam/scsi/scsi_all.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/compat/linprocfs/linprocfs.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files#8 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.amd64#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.i386#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.pc98#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/kern.mk#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/kern.post.mk#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/kmod.mk#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/ata-all.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_common.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_adapter.h#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_main.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_sge.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_em.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_em.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_igb.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_igb.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_lem.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_lem.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_core.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_core.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_intel.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_uncore.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_uncore.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/pmc_events.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/sound/pci/es137x.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/deadfs/dead_vnops.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsserver/nfs_nfsdport.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsserver/nfs_nfsdserv.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/include/pmc_mdep.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_alq.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_default.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#11 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/alq/Makefile#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/modules/hwpmc/Makefile#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_input.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/net80211/ieee80211_var.h#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_deflate.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_ksocket.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_l2tp.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_mppc.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_ppp.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_pptpgre.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_tcpmss.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/in.h#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_fw_sockopt.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/fhc/fhc.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/pci/apb.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/pci/schizo.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sbus/sbus.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/trap.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/ioccom.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/pmc.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/vnode.h#5 integrate
Differences ...
==== //depot/projects/soc2009/anchie_send/src/sys/amd64/include/pmc_mdep.h#3 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.9 2009/08/14 21:05:08 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.10 2010/04/02 13:23:49 fabient Exp $
*/
/* Machine dependent interfaces */
@@ -43,17 +43,20 @@
#include <dev/hwpmc/hwpmc_core.h>
#include <dev/hwpmc/hwpmc_piv.h>
#include <dev/hwpmc/hwpmc_tsc.h>
+#include <dev/hwpmc/hwpmc_uncore.h>
/*
* Intel processors implementing V2 and later of the Intel performance
* measurement architecture have PMCs of the following classes: TSC,
- * IAF and IAP.
+ * IAF, IAP, UCF and UCP.
*/
#define PMC_MDEP_CLASS_INDEX_TSC 0
#define PMC_MDEP_CLASS_INDEX_K8 1
#define PMC_MDEP_CLASS_INDEX_P4 1
#define PMC_MDEP_CLASS_INDEX_IAP 1
#define PMC_MDEP_CLASS_INDEX_IAF 2
+#define PMC_MDEP_CLASS_INDEX_UCP 3
+#define PMC_MDEP_CLASS_INDEX_UCF 4
/*
* On the amd64 platform we support the following PMCs.
@@ -63,12 +66,16 @@
* PIV Intel P4/HTT and P4/EMT64
* IAP Intel Core/Core2/Atom CPUs in 64 bits mode.
* IAF Intel fixed-function PMCs in Core2 and later CPUs.
+ * UCP Intel Uncore programmable PMCs.
+ * UCF Intel Uncore fixed-function PMCs.
*/
union pmc_md_op_pmcallocate {
struct pmc_md_amd_op_pmcallocate pm_amd;
struct pmc_md_iaf_op_pmcallocate pm_iaf;
struct pmc_md_iap_op_pmcallocate pm_iap;
+ struct pmc_md_ucf_op_pmcallocate pm_ucf;
+ struct pmc_md_ucp_op_pmcallocate pm_ucp;
struct pmc_md_p4_op_pmcallocate pm_p4;
uint64_t __pad[4];
};
@@ -83,6 +90,8 @@
struct pmc_md_amd_pmc pm_amd;
struct pmc_md_iaf_pmc pm_iaf;
struct pmc_md_iap_pmc pm_iap;
+ struct pmc_md_ucf_pmc pm_ucf;
+ struct pmc_md_ucp_pmc pm_ucp;
struct pmc_md_p4_pmc pm_p4;
};
==== //depot/projects/soc2009/anchie_send/src/sys/arm/mv/mv_sata.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.4 2009/12/08 21:42:04 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.6 2010/04/01 19:05:43 mav Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -600,7 +600,12 @@
crqb->crqb_ata_lba_mid = request->u.ata.lba >> 8;
crqb->crqb_ata_lba_high = request->u.ata.lba >> 16;
crqb->crqb_ata_device = ((request->u.ata.lba >> 24) & 0x0F) | (1 << 6);
+ crqb->crqb_ata_lba_low_p = request->u.ata.lba >> 24;
+ crqb->crqb_ata_lba_mid_p = request->u.ata.lba >> 32;
+ crqb->crqb_ata_lba_high_p = request->u.ata.lba >> 40;
+ crqb->crqb_ata_feature_p = request->u.ata.feature >> 8;
crqb->crqb_ata_count = request->u.ata.count;
+ crqb->crqb_ata_count_p = request->u.ata.count >> 8;
bus_dmamap_sync(ch->dma.work_tag, ch->dma.work_map,
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
==== //depot/projects/soc2009/anchie_send/src/sys/cam/cam_xpt.c#6 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.245 2010/02/26 10:33:48 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.246 2010/03/31 17:47:57 mjacob Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -2380,6 +2380,7 @@
if (start_ccb->ccb_h.func_code == XPT_ATA_IO) {
start_ccb->ataio.resid = 0;
}
+ /* FALLTHROUGH */
case XPT_RESET_DEV:
case XPT_ENG_EXEC:
{
@@ -2888,6 +2889,9 @@
case XPT_ENG_INQ:
/* XXX Implement */
start_ccb->ccb_h.status = CAM_PROVIDE_FAIL;
+ if (start_ccb->ccb_h.func_code & XPT_FC_DEV_QUEUED) {
+ xpt_done(start_ccb);
+ }
break;
}
}
@@ -3930,7 +3934,7 @@
struct cam_et *target, struct cam_ed *device,
void *async_arg)
{
- printf("xpt_dev_async called\n");
+ printf("%s called\n", __func__);
}
u_int32_t
@@ -4919,4 +4923,3 @@
(*ccb_h->cbfcnp)(ccb_h->path->periph, (union ccb *)ccb_h);
}
}
-
==== //depot/projects/soc2009/anchie_send/src/sys/cam/scsi/scsi_all.h#2 (text+ko) ====
@@ -14,7 +14,7 @@
*
* Ported to run under 386BSD by Julian Elischer (julian at tfs.com) Sept 1992
*
- * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.31 2008/08/07 17:25:05 jkim Exp $
+ * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.32 2010/04/01 01:49:43 mjacob Exp $
*/
/*
@@ -170,6 +170,8 @@
#define SMS_PAGE_CODE 0x3F
#define SMS_VENDOR_SPECIFIC_PAGE 0x00
#define SMS_DISCONNECT_RECONNECT_PAGE 0x02
+#define SMS_FORMAT_DEVICE_PAGE 0x03
+#define SMS_GEOMETRY_PAGE 0x04
#define SMS_CACHE_PAGE 0x08
#define SMS_PERIPHERAL_DEVICE_PAGE 0x09
#define SMS_CONTROL_MODE_PAGE 0x0A
==== //depot/projects/soc2009/anchie_send/src/sys/compat/linprocfs/linprocfs.c#6 (text+ko) ====
@@ -42,7 +42,7 @@
#include "opt_compat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.148 2010/03/26 14:36:16 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.149 2010/04/02 06:50:28 netchild Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -110,12 +110,14 @@
/*
* Various conversion macros
*/
-#define T2J(x) (((x) * 100UL) / (stathz ? stathz : hz)) /* ticks to jiffies */
+#define T2J(x) ((long)(((x) * 100ULL) / (stathz ? stathz : hz))) /* ticks to jiffies */
+#define T2CS(x) ((unsigned long)(((x) * 100ULL) / (stathz ? stathz : hz))) /* ticks to centiseconds */
#define T2S(x) ((x) / (stathz ? stathz : hz)) /* ticks to seconds */
#define B2K(x) ((x) >> 10) /* bytes to kbytes */
#define B2P(x) ((x) >> PAGE_SHIFT) /* bytes to pages */
#define P2B(x) ((x) << PAGE_SHIFT) /* pages to bytes */
#define P2K(x) ((x) << (PAGE_SHIFT - 10)) /* pages to kbytes */
+#define TV2J(x) ((x)->tv_sec * 100UL + (x)->tv_usec / 10000)
/**
* @brief Mapping of ki_stat in struct kinfo_proc to the linux state
@@ -505,9 +507,10 @@
getmicrouptime(&tv);
read_cpu_time(cp_time);
- sbuf_printf(sb, "%lld.%02ld %ld.%02ld\n",
+ sbuf_printf(sb, "%lld.%02ld %ld.%02lu\n",
(long long)tv.tv_sec, tv.tv_usec / 10000,
- T2S(cp_time[CP_IDLE]), T2J(cp_time[CP_IDLE]) % 100);
+ T2S(cp_time[CP_IDLE] / mp_ncpus),
+ T2CS(cp_time[CP_IDLE] / mp_ncpus) % 100);
return (0);
}
@@ -613,9 +616,17 @@
struct kinfo_proc kp;
char state;
static int ratelimit = 0;
+ vm_offset_t startcode, startdata;
PROC_LOCK(p);
fill_kinfo_proc(p, &kp);
+ if (p->p_vmspace) {
+ startcode = (vm_offset_t)p->p_vmspace->vm_taddr;
+ startdata = (vm_offset_t)p->p_vmspace->vm_daddr;
+ } else {
+ startcode = 0;
+ startdata = 0;
+ };
sbuf_printf(sb, "%d", p->p_pid);
#define PS_ADD(name, fmt, arg) sbuf_printf(sb, " " fmt, arg)
PS_ADD("comm", "(%s)", p->p_comm);
@@ -634,30 +645,27 @@
PS_ADD("pgrp", "%d", p->p_pgid);
PS_ADD("session", "%d", p->p_session->s_sid);
PROC_UNLOCK(p);
- PS_ADD("tty", "%d", 0); /* XXX */
+ PS_ADD("tty", "%d", kp.ki_tdev);
PS_ADD("tpgid", "%d", kp.ki_tpgid);
PS_ADD("flags", "%u", 0); /* XXX */
PS_ADD("minflt", "%lu", kp.ki_rusage.ru_minflt);
PS_ADD("cminflt", "%lu", kp.ki_rusage_ch.ru_minflt);
PS_ADD("majflt", "%lu", kp.ki_rusage.ru_majflt);
PS_ADD("cmajflt", "%lu", kp.ki_rusage_ch.ru_majflt);
- PS_ADD("utime", "%ld", T2J(tvtohz(&kp.ki_rusage.ru_utime)));
- PS_ADD("stime", "%ld", T2J(tvtohz(&kp.ki_rusage.ru_stime)));
- PS_ADD("cutime", "%ld", T2J(tvtohz(&kp.ki_rusage_ch.ru_utime)));
- PS_ADD("cstime", "%ld", T2J(tvtohz(&kp.ki_rusage_ch.ru_stime)));
+ PS_ADD("utime", "%ld", TV2J(&kp.ki_rusage.ru_utime));
+ PS_ADD("stime", "%ld", TV2J(&kp.ki_rusage.ru_stime));
+ PS_ADD("cutime", "%ld", TV2J(&kp.ki_rusage_ch.ru_utime));
+ PS_ADD("cstime", "%ld", TV2J(&kp.ki_rusage_ch.ru_stime));
PS_ADD("priority", "%d", kp.ki_pri.pri_user);
PS_ADD("nice", "%d", kp.ki_nice); /* 19 (nicest) to -19 */
PS_ADD("0", "%d", 0); /* removed field */
PS_ADD("itrealvalue", "%d", 0); /* XXX */
- /* XXX: starttime is not right, it is the _same_ for _every_ process.
- It should be the number of jiffies between system boot and process
- start. */
- PS_ADD("starttime", "%lu", T2J(tvtohz(&kp.ki_start)));
+ PS_ADD("starttime", "%lu", TV2J(&kp.ki_start) - TV2J(&boottime));
PS_ADD("vsize", "%ju", P2K((uintmax_t)kp.ki_size));
PS_ADD("rss", "%ju", (uintmax_t)kp.ki_rssize);
PS_ADD("rlim", "%lu", kp.ki_rusage.ru_maxrss);
- PS_ADD("startcode", "%u", (unsigned)0);
- PS_ADD("endcode", "%u", 0); /* XXX */
+ PS_ADD("startcode", "%ju", (uintmax_t)startcode);
+ PS_ADD("endcode", "%ju", (uintmax_t)startdata);
PS_ADD("startstack", "%u", 0); /* XXX */
PS_ADD("kstkesp", "%u", 0); /* XXX */
PS_ADD("kstkeip", "%u", 0); /* XXX */
@@ -800,7 +808,7 @@
*/
sbuf_printf(sb, "VmSize:\t%8ju kB\n", B2K((uintmax_t)kp.ki_size));
sbuf_printf(sb, "VmLck:\t%8u kB\n", P2K(0)); /* XXX */
- sbuf_printf(sb, "VmRss:\t%8ju kB\n", P2K((uintmax_t)kp.ki_rssize));
+ sbuf_printf(sb, "VmRSS:\t%8ju kB\n", P2K((uintmax_t)kp.ki_rssize));
sbuf_printf(sb, "VmData:\t%8ju kB\n", P2K((uintmax_t)kp.ki_dsize));
sbuf_printf(sb, "VmStk:\t%8ju kB\n", P2K((uintmax_t)kp.ki_ssize));
sbuf_printf(sb, "VmExe:\t%8ju kB\n", P2K((uintmax_t)kp.ki_tsize));
==== //depot/projects/soc2009/anchie_send/src/sys/conf/files#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1508 2010/03/29 23:36:34 jfv Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1509 2010/03/31 20:15:20 mav Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -2322,7 +2322,7 @@
net/if_faith.c optional faith
net/if_fddisubr.c optional fddi
net/if_fwsubr.c optional fwip
-net/if_gif.c optional gif
+net/if_gif.c optional gif | netgraph_gif
net/if_gre.c optional gre inet
net/if_iso88025subr.c optional token
net/if_lagg.c optional lagg
@@ -2485,7 +2485,7 @@
netinet/igmp.c optional inet
netinet/in.c optional inet
netinet/ip_carp.c optional inet carp | inet6 carp
-netinet/in_gif.c optional gif inet
+netinet/in_gif.c optional gif inet | netgraph_gif inet
netinet/ip_gre.c optional gre inet
netinet/ip_id.c optional inet
netinet/in_mcast.c optional inet
@@ -2560,7 +2560,7 @@
netinet6/icmp6.c optional inet6
netinet6/in6.c optional inet6
netinet6/in6_cksum.c optional inet6
-netinet6/in6_gif.c optional gif inet6
+netinet6/in6_gif.c optional gif inet6 | netgraph_gif inet6
netinet6/in6_ifattach.c optional inet6
netinet6/in6_mcast.c optional inet6
netinet6/in6_pcb.c optional inet6
==== //depot/projects/soc2009/anchie_send/src/sys/conf/files.amd64#6 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.amd64,v 1.154 2010/03/11 14:49:06 nwhitehorn Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.155 2010/04/02 13:23:49 fabient Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -198,6 +198,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_intel.c optional hwpmc
dev/hwpmc/hwpmc_core.c optional hwpmc
+dev/hwpmc/hwpmc_uncore.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
dev/hwpmc/hwpmc_tsc.c optional hwpmc
dev/hwpmc/hwpmc_x86.c optional hwpmc
==== //depot/projects/soc2009/anchie_send/src/sys/conf/files.i386#6 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.638 2010/02/25 14:13:39 attilio Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.639 2010/04/02 13:23:49 fabient Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -179,6 +179,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_intel.c optional hwpmc
dev/hwpmc/hwpmc_core.c optional hwpmc
+dev/hwpmc/hwpmc_uncore.c optional hwpmc
dev/hwpmc/hwpmc_pentium.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
dev/hwpmc/hwpmc_ppro.c optional hwpmc
==== //depot/projects/soc2009/anchie_send/src/sys/conf/files.pc98#4 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801/PC-9821
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.381 2010/02/25 15:44:54 nyan Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.382 2010/04/02 13:23:49 fabient Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -99,6 +99,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_intel.c optional hwpmc
dev/hwpmc/hwpmc_core.c optional hwpmc
+dev/hwpmc/hwpmc_uncore.c optional hwpmc
dev/hwpmc/hwpmc_pentium.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
dev/hwpmc/hwpmc_ppro.c optional hwpmc
==== //depot/projects/soc2009/anchie_send/src/sys/conf/kern.mk#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.mk,v 1.62 2010/01/19 11:42:15 ru Exp $
+# $FreeBSD: src/sys/conf/kern.mk,v 1.63 2010/04/02 06:55:31 netchild Exp $
#
# Warning flags for compiling the kernel and components of the kernel.
@@ -108,3 +108,11 @@
${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips"
CFLAGS+= -fstack-protector
.endif
+
+#
+# Enable CTF conversation on request.
+#
+.if defined(WITH_CTF)
+.undef NO_CTF
+.endif
+
==== //depot/projects/soc2009/anchie_send/src/sys/conf/kern.post.mk#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.106 2010/03/25 13:47:21 netchild Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.107 2010/04/02 06:55:31 netchild Exp $
# Part of a unified Makefile for building kernels. This part includes all
# the definitions that need to be after all the % directives except %RULES
@@ -19,6 +19,10 @@
MKMODULESENV+= CONF_CFLAGS="${CONF_CFLAGS}"
.endif
+.if defined(WITH_CTF)
+MKMODULESENV+= WITH_CTF="${WITH_CTF}"
+.endif
+
.MAIN: all
.for target in all clean cleandepend cleandir clobber depend install \
@@ -90,9 +94,7 @@
@rm -f ${.TARGET}
@echo linking ${.TARGET}
${SYSTEM_LD}
-.if defined(CTFMERGE)
- ${SYSTEM_CTFMERGE}
-.endif
+ @${SYSTEM_CTFMERGE}
.if !defined(DEBUG)
${OBJCOPY} --strip-debug ${.TARGET}
.endif
@@ -240,9 +242,7 @@
config.o env.o hints.o vers.o vnode_if.o:
${NORMAL_C}
-.if defined(CTFCONVERT)
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+ @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
config.ln env.ln hints.ln vers.ln vnode_if.ln:
${NORMAL_LINT}
==== //depot/projects/soc2009/anchie_send/src/sys/conf/kern.pre.mk#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.107 2009/05/27 16:16:56 thompsa Exp $
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.108 2010/04/02 06:55:31 netchild Exp $
# Part of a unified Makefile for building kernels. This part contains all
# of the definitions that need to be before %BEFORE_DEPEND.
@@ -128,11 +128,7 @@
NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
-.if defined(CTFCONVERT)
-NORMAL_CTFCONVERT= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.else
-NORMAL_CTFCONVERT=
-.endif
+NORMAL_CTFCONVERT= [ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC}
@@ -142,10 +138,7 @@
SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}
SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
SYSTEM_OBJS+= hack.So
-.if defined(CTFMERGE)
-SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
-LD+= -g
-.endif
+SYSTEM_CTFMERGE= [ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} \
-warn-common -export-dynamic -dynamic-linker /red/herring \
-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
==== //depot/projects/soc2009/anchie_send/src/sys/conf/kmod.mk#5 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/sys/conf/kmod.mk,v 1.230 2010/03/26 08:47:07 netchild Exp $
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.231 2010/04/02 06:55:31 netchild Exp $
#
# The include file <bsd.kmod.mk> handles building and installing loadable
# kernel modules.
@@ -69,6 +69,11 @@
.error "Do not use KMODDEPS on 5.0+; use MODULE_VERSION/MODULE_DEPEND"
.endif
+# Enable CTF conversion on request.
+.if defined(WITH_CTF)
+.undef NO_CTF
+.endif
+
.include <bsd.init.mk>
.SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
==== //depot/projects/soc2009/anchie_send/src/sys/dev/ata/ata-all.h#5 (text+ko) ====
@@ -23,9 +23,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.152 2010/02/02 11:09:28 mav Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.153 2010/03/31 07:20:10 mav Exp $
*/
+#include "opt_ata.h"
+
#if 0
#define ATA_LEGACY_SUPPORT /* Enable obsolete features that break
* some modern devices */
==== //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/common/cxgb_ael1002.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.16 2010/03/09 19:57:44 np Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.17 2010/03/31 00:21:56 np Exp $");
#include <cxgb_include.h>
@@ -1447,395 +1447,439 @@
0xd803, 0x40aa,
0xd804, 0x401c,
0xd805, 0x401e,
- 0xd806, 0x2ff4,
- 0xd807, 0x3dc4,
- 0xd808, 0x2035,
- 0xd809, 0x3035,
- 0xd80a, 0x6524,
- 0xd80b, 0x2cb2,
- 0xd80c, 0x3012,
- 0xd80d, 0x1002,
- 0xd80e, 0x26e2,
- 0xd80f, 0x3022,
- 0xd810, 0x1002,
- 0xd811, 0x27d2,
- 0xd812, 0x3022,
+ 0xd806, 0x20c5,
+ 0xd807, 0x3c05,
+ 0xd808, 0x6536,
+ 0xd809, 0x2fe4,
+ 0xd80a, 0x3dc4,
+ 0xd80b, 0x6624,
+ 0xd80c, 0x2ff4,
+ 0xd80d, 0x3dc4,
+ 0xd80e, 0x2035,
+ 0xd80f, 0x30a5,
+ 0xd810, 0x6524,
+ 0xd811, 0x2ca2,
+ 0xd812, 0x3012,
0xd813, 0x1002,
- 0xd814, 0x2822,
- 0xd815, 0x3012,
+ 0xd814, 0x27e2,
+ 0xd815, 0x3022,
0xd816, 0x1002,
- 0xd817, 0x2492,
+ 0xd817, 0x28d2,
0xd818, 0x3022,
0xd819, 0x1002,
- 0xd81a, 0x2772,
+ 0xd81a, 0x2892,
0xd81b, 0x3012,
0xd81c, 0x1002,
- 0xd81d, 0x23d2,
+ 0xd81d, 0x24e2,
0xd81e, 0x3022,
0xd81f, 0x1002,
- 0xd820, 0x22cd,
- 0xd821, 0x301d,
- 0xd822, 0x27f2,
- 0xd823, 0x3022,
- 0xd824, 0x1002,
- 0xd825, 0x5553,
- 0xd826, 0x0307,
- 0xd827, 0x2522,
- 0xd828, 0x3022,
- 0xd829, 0x1002,
- 0xd82a, 0x2142,
- 0xd82b, 0x3012,
- 0xd82c, 0x1002,
- 0xd82d, 0x4016,
- 0xd82e, 0x5e63,
- 0xd82f, 0x0344,
- 0xd830, 0x2142,
+ 0xd820, 0x27e2,
+ 0xd821, 0x3012,
+ 0xd822, 0x1002,
+ 0xd823, 0x2422,
+ 0xd824, 0x3022,
+ 0xd825, 0x1002,
+ 0xd826, 0x22cd,
+ 0xd827, 0x301d,
+ 0xd828, 0x28f2,
+ 0xd829, 0x3022,
+ 0xd82a, 0x1002,
+ 0xd82b, 0x5553,
+ 0xd82c, 0x0307,
+ 0xd82d, 0x2572,
+ 0xd82e, 0x3022,
+ 0xd82f, 0x1002,
+ 0xd830, 0x21a2,
0xd831, 0x3012,
0xd832, 0x1002,
- 0xd833, 0x400e,
- 0xd834, 0x2522,
- 0xd835, 0x3022,
- 0xd836, 0x1002,
- 0xd837, 0x2b52,
- 0xd838, 0x3012,
- 0xd839, 0x1002,
- 0xd83a, 0x2742,
+ 0xd833, 0x4016,
+ 0xd834, 0x5e63,
+ 0xd835, 0x0344,
+ 0xd836, 0x21a2,
+ 0xd837, 0x3012,
+ 0xd838, 0x1002,
+ 0xd839, 0x400e,
+ 0xd83a, 0x2572,
0xd83b, 0x3022,
0xd83c, 0x1002,
- 0xd83d, 0x25e2,
- 0xd83e, 0x3022,
+ 0xd83d, 0x2b22,
+ 0xd83e, 0x3012,
0xd83f, 0x1002,
- 0xd840, 0x2fa4,
- 0xd841, 0x3dc4,
- 0xd842, 0x6624,
- 0xd843, 0x414b,
- 0xd844, 0x56b3,
- 0xd845, 0x03c6,
- 0xd846, 0x866b,
- 0xd847, 0x400c,
- 0xd848, 0x2712,
- 0xd849, 0x3012,
- 0xd84a, 0x1002,
- 0xd84b, 0x2c4b,
- 0xd84c, 0x309b,
- 0xd84d, 0x56b3,
- 0xd84e, 0x03c3,
- 0xd84f, 0x866b,
- 0xd850, 0x400c,
- 0xd851, 0x2272,
- 0xd852, 0x3022,
- 0xd853, 0x1002,
- 0xd854, 0x2742,
- 0xd855, 0x3022,
- 0xd856, 0x1002,
- 0xd857, 0x25e2,
- 0xd858, 0x3022,
- 0xd859, 0x1002,
- 0xd85a, 0x2fb4,
- 0xd85b, 0x3dc4,
- 0xd85c, 0x6624,
- 0xd85d, 0x56b3,
- 0xd85e, 0x03c3,
- 0xd85f, 0x866b,
- 0xd860, 0x401c,
- 0xd861, 0x2c45,
- 0xd862, 0x3095,
- 0xd863, 0x5b53,
- 0xd864, 0x2372,
- 0xd865, 0x3012,
- 0xd866, 0x13c2,
- 0xd867, 0x5cc3,
- 0xd868, 0x2712,
- 0xd869, 0x3012,
- 0xd86a, 0x1312,
- 0xd86b, 0x2b52,
+ 0xd840, 0x2842,
+ 0xd841, 0x3022,
+ 0xd842, 0x1002,
+ 0xd843, 0x26e2,
+ 0xd844, 0x3022,
+ 0xd845, 0x1002,
+ 0xd846, 0x2fa4,
+ 0xd847, 0x3dc4,
+ 0xd848, 0x6624,
+ 0xd849, 0x2e8b,
+ 0xd84a, 0x303b,
+ 0xd84b, 0x56b3,
+ 0xd84c, 0x03c6,
+ 0xd84d, 0x866b,
+ 0xd84e, 0x400c,
+ 0xd84f, 0x2782,
+ 0xd850, 0x3012,
+ 0xd851, 0x1002,
+ 0xd852, 0x2c4b,
+ 0xd853, 0x309b,
+ 0xd854, 0x56b3,
+ 0xd855, 0x03c3,
+ 0xd856, 0x866b,
+ 0xd857, 0x400c,
+ 0xd858, 0x22a2,
+ 0xd859, 0x3022,
+ 0xd85a, 0x1002,
+ 0xd85b, 0x2842,
+ 0xd85c, 0x3022,
+ 0xd85d, 0x1002,
+ 0xd85e, 0x26e2,
+ 0xd85f, 0x3022,
+ 0xd860, 0x1002,
+ 0xd861, 0x2fb4,
+ 0xd862, 0x3dc4,
+ 0xd863, 0x6624,
+ 0xd864, 0x56b3,
+ 0xd865, 0x03c3,
+ 0xd866, 0x866b,
+ 0xd867, 0x401c,
+ 0xd868, 0x2c45,
+ 0xd869, 0x3095,
+ 0xd86a, 0x5b53,
+ 0xd86b, 0x23d2,
0xd86c, 0x3012,
- 0xd86d, 0x1002,
- 0xd86e, 0x2742,
- 0xd86f, 0x3022,
- 0xd870, 0x1002,
- 0xd871, 0x2582,
- 0xd872, 0x3022,
- 0xd873, 0x1002,
- 0xd874, 0x2142,
- 0xd875, 0x3012,
- 0xd876, 0x1002,
- 0xd877, 0x628f,
- 0xd878, 0x2985,
- 0xd879, 0x33a5,
- 0xd87a, 0x25e2,
- 0xd87b, 0x3022,
- 0xd87c, 0x1002,
- 0xd87d, 0x5653,
- 0xd87e, 0x03d2,
- 0xd87f, 0x401e,
- 0xd880, 0x6f72,
- 0xd881, 0x1002,
- 0xd882, 0x628f,
- 0xd883, 0x2304,
- 0xd884, 0x3c84,
- 0xd885, 0x6436,
- 0xd886, 0xdff4,
- 0xd887, 0x6436,
- 0xd888, 0x2ff5,
- 0xd889, 0x3005,
- 0xd88a, 0x8656,
- 0xd88b, 0xdfba,
- 0xd88c, 0x56a3,
- 0xd88d, 0xd05a,
- 0xd88e, 0x2972,
- 0xd88f, 0x3012,
- 0xd890, 0x1392,
- 0xd891, 0xd05a,
- 0xd892, 0x56a3,
- 0xd893, 0xdfba,
- 0xd894, 0x0383,
- 0xd895, 0x6f72,
- 0xd896, 0x1002,
- 0xd897, 0x2b45,
- 0xd898, 0x3005,
- 0xd899, 0x4178,
- 0xd89a, 0x5653,
- 0xd89b, 0x0384,
- 0xd89c, 0x2a62,
- 0xd89d, 0x3012,
- 0xd89e, 0x1002,
- 0xd89f, 0x2f05,
- 0xd8a0, 0x3005,
- 0xd8a1, 0x41c8,
- 0xd8a2, 0x5653,
- 0xd8a3, 0x0382,
- 0xd8a4, 0x0002,
- 0xd8a5, 0x4218,
- 0xd8a6, 0x2474,
- 0xd8a7, 0x3c84,
- 0xd8a8, 0x6437,
- 0xd8a9, 0xdff4,
- 0xd8aa, 0x6437,
- 0xd8ab, 0x2ff5,
- 0xd8ac, 0x3c05,
- 0xd8ad, 0x8757,
- 0xd8ae, 0xb888,
- 0xd8af, 0x9787,
- 0xd8b0, 0xdff4,
- 0xd8b1, 0x6724,
- 0xd8b2, 0x866a,
- 0xd8b3, 0x6f72,
- 0xd8b4, 0x1002,
- 0xd8b5, 0x2641,
- 0xd8b6, 0x3021,
- 0xd8b7, 0x1001,
- 0xd8b8, 0xc620,
- 0xd8b9, 0x0000,
- 0xd8ba, 0xc621,
- 0xd8bb, 0x0000,
- 0xd8bc, 0xc622,
- 0xd8bd, 0x00ce,
- 0xd8be, 0xc623,
- 0xd8bf, 0x007f,
- 0xd8c0, 0xc624,
- 0xd8c1, 0x0032,
- 0xd8c2, 0xc625,
- 0xd8c3, 0x0000,
- 0xd8c4, 0xc627,
- 0xd8c5, 0x0000,
- 0xd8c6, 0xc628,
- 0xd8c7, 0x0000,
- 0xd8c8, 0xc62c,
+ 0xd86d, 0x13c2,
+ 0xd86e, 0x5cc3,
+ 0xd86f, 0x2782,
+ 0xd870, 0x3012,
+ 0xd871, 0x1312,
+ 0xd872, 0x2b22,
+ 0xd873, 0x3012,
+ 0xd874, 0x1002,
+ 0xd875, 0x2842,
+ 0xd876, 0x3022,
+ 0xd877, 0x1002,
+ 0xd878, 0x2622,
+ 0xd879, 0x3022,
+ 0xd87a, 0x1002,
+ 0xd87b, 0x21a2,
+ 0xd87c, 0x3012,
+ 0xd87d, 0x1002,
+ 0xd87e, 0x628f,
+ 0xd87f, 0x2985,
+ 0xd880, 0x33a5,
+ 0xd881, 0x26e2,
+ 0xd882, 0x3022,
+ 0xd883, 0x1002,
+ 0xd884, 0x5653,
+ 0xd885, 0x03d2,
+ 0xd886, 0x401e,
+ 0xd887, 0x6f72,
+ 0xd888, 0x1002,
+ 0xd889, 0x628f,
+ 0xd88a, 0x2304,
+ 0xd88b, 0x3c84,
+ 0xd88c, 0x6436,
+ 0xd88d, 0xdff4,
+ 0xd88e, 0x6436,
+ 0xd88f, 0x2ff5,
+ 0xd890, 0x3005,
+ 0xd891, 0x8656,
+ 0xd892, 0xdfba,
+ 0xd893, 0x56a3,
+ 0xd894, 0xd05a,
+ 0xd895, 0x29e2,
+ 0xd896, 0x3012,
+ 0xd897, 0x1392,
+ 0xd898, 0xd05a,
+ 0xd899, 0x56a3,
+ 0xd89a, 0xdfba,
+ 0xd89b, 0x0383,
+ 0xd89c, 0x6f72,
+ 0xd89d, 0x1002,
+ 0xd89e, 0x2a64,
+ 0xd89f, 0x3014,
+ 0xd8a0, 0x2005,
+ 0xd8a1, 0x3d75,
+ 0xd8a2, 0xc451,
+ 0xd8a3, 0x29a2,
+ 0xd8a4, 0x3022,
+ 0xd8a5, 0x1002,
+ 0xd8a6, 0x178c,
+ 0xd8a7, 0x1898,
+ 0xd8a8, 0x19a4,
+ 0xd8a9, 0x1ab0,
+ 0xd8aa, 0x1bbc,
+ 0xd8ab, 0x1cc8,
+ 0xd8ac, 0x1dd3,
+ 0xd8ad, 0x1ede,
+ 0xd8ae, 0x1fe9,
+ 0xd8af, 0x20f4,
+ 0xd8b0, 0x21ff,
+ 0xd8b1, 0x0000,
+ 0xd8b2, 0x2741,
+ 0xd8b3, 0x3021,
+ 0xd8b4, 0x1001,
+ 0xd8b5, 0xc620,
+ 0xd8b6, 0x0000,
+ 0xd8b7, 0xc621,
+ 0xd8b8, 0x0000,
+ 0xd8b9, 0xc622,
+ 0xd8ba, 0x00e2,
+ 0xd8bb, 0xc623,
+ 0xd8bc, 0x007f,
+ 0xd8bd, 0xc624,
+ 0xd8be, 0x00ce,
+ 0xd8bf, 0xc625,
+ 0xd8c0, 0x0000,
+ 0xd8c1, 0xc627,
+ 0xd8c2, 0x0000,
+ 0xd8c3, 0xc628,
+ 0xd8c4, 0x0000,
+ 0xd8c5, 0xc90a,
+ 0xd8c6, 0x3a7c,
+ 0xd8c7, 0xc62c,
+ 0xd8c8, 0x0000,
0xd8c9, 0x0000,
- 0xd8ca, 0x0000,
- 0xd8cb, 0x2641,
- 0xd8cc, 0x3021,
- 0xd8cd, 0x1001,
- 0xd8ce, 0xc502,
- 0xd8cf, 0x53ac,
- 0xd8d0, 0xc503,
- 0xd8d1, 0x2cd3,
- 0xd8d2, 0xc600,
- 0xd8d3, 0x2a6e,
- 0xd8d4, 0xc601,
- 0xd8d5, 0x2a2c,
- 0xd8d6, 0xc605,
- 0xd8d7, 0x5557,
- 0xd8d8, 0xc60c,
- 0xd8d9, 0x5400,
- 0xd8da, 0xc710,
- 0xd8db, 0x0700,
- 0xd8dc, 0xc711,
- 0xd8dd, 0x0f06,
- 0xd8de, 0xc718,
- 0xd8df, 0x0700,
- 0xd8e0, 0xc719,
- 0xd8e1, 0x0f06,
- 0xd8e2, 0xc720,
- 0xd8e3, 0x4700,
- 0xd8e4, 0xc721,
- 0xd8e5, 0x0f06,
- 0xd8e6, 0xc728,
- 0xd8e7, 0x0700,
- 0xd8e8, 0xc729,
- 0xd8e9, 0x1207,
- 0xd8ea, 0xc801,
- 0xd8eb, 0x7f50,
- 0xd8ec, 0xc802,
- 0xd8ed, 0x7760,
- 0xd8ee, 0xc803,
- 0xd8ef, 0x7fce,
- 0xd8f0, 0xc804,
- 0xd8f1, 0x520e,
- 0xd8f2, 0xc805,
- 0xd8f3, 0x5c11,
- 0xd8f4, 0xc806,
- 0xd8f5, 0x3c51,
- 0xd8f6, 0xc807,
- 0xd8f7, 0x4061,
- 0xd8f8, 0xc808,
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list