svn commit: r365223 - head/sys/sys
Mateusz Guzik
mjg at FreeBSD.org
Tue Sep 1 22:13:10 UTC 2020
Author: mjg
Date: Tue Sep 1 22:12:58 2020
New Revision: 365223
URL: https://svnweb.freebsd.org/changeset/base/365223
Log:
sys: clean up empty lines in .c and .h files
Modified:
head/sys/sys/_atomic64e.h
head/sys/sys/_rangeset.h
head/sys/sys/_stdarg.h
head/sys/sys/_termios.h
head/sys/sys/assym.h
head/sys/sys/ata.h
head/sys/sys/blist.h
head/sys/sys/buf_ring.h
head/sys/sys/bus.h
head/sys/sys/bus_dma_internal.h
head/sys/sys/cdio.h
head/sys/sys/chio.h
head/sys/sys/cnv.h
head/sys/sys/conf.h
head/sys/sys/copyright.h
head/sys/sys/disk.h
head/sys/sys/domainset.h
head/sys/sys/endian.h
head/sys/sys/event.h
head/sys/sys/fail.h
head/sys/sys/fcntl.h
head/sys/sys/fdcio.h
head/sys/sys/imgact_aout.h
head/sys/sys/intr.h
head/sys/sys/iov.h
head/sys/sys/ipmi.h
head/sys/sys/kernel.h
head/sys/sys/kobj.h
head/sys/sys/kthread.h
head/sys/sys/libkern.h
head/sys/sys/linker.h
head/sys/sys/lock.h
head/sys/sys/lock_profile.h
head/sys/sys/lockstat.h
head/sys/sys/mtio.h
head/sys/sys/pmc.h
head/sys/sys/posix4.h
head/sys/sys/power.h
head/sys/sys/proc.h
head/sys/sys/queue.h
head/sys/sys/random.h
head/sys/sys/rwlock.h
head/sys/sys/serial.h
head/sys/sys/socket.h
head/sys/sys/sockopt.h
head/sys/sys/soundcard.h
head/sys/sys/stats.h
head/sys/sys/stdatomic.h
head/sys/sys/sysproto.h
head/sys/sys/systm.h
head/sys/sys/tiio.h
head/sys/sys/tim_filter.h
head/sys/sys/timeet.h
head/sys/sys/timepps.h
head/sys/sys/tree.h
head/sys/sys/vnode.h
Modified: head/sys/sys/_atomic64e.h
==============================================================================
--- head/sys/sys/_atomic64e.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/_atomic64e.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -27,7 +27,6 @@
* $FreeBSD$
*/
-
#ifndef _SYS_ATOMIC64E_H_
#define _SYS_ATOMIC64E_H_
Modified: head/sys/sys/_rangeset.h
==============================================================================
--- head/sys/sys/_rangeset.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/_rangeset.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -48,4 +48,3 @@ struct rangeset {
};
#endif
-
Modified: head/sys/sys/_stdarg.h
==============================================================================
--- head/sys/sys/_stdarg.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/_stdarg.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -52,4 +52,3 @@
#endif
#endif /* ! _SYS__STDARG_H_ */
-
Modified: head/sys/sys/_termios.h
==============================================================================
--- head/sys/sys/_termios.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/_termios.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -146,7 +146,6 @@
#define CNO_RTSDTR 0x00200000 /* Do not assert RTS or DTR automatically */
#endif
-
/*
* "Local" flags - dumping ground for other state
*
Modified: head/sys/sys/assym.h
==============================================================================
--- head/sys/sys/assym.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/assym.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -43,7 +43,6 @@ char name ## w1[((ASSYM_ABS(value) & 0xFFFF0000UL) >>
char name ## w2[((ASSYM_ABS(value) & 0xFFFF00000000ULL) >> 32) + ASSYM_BIAS]; \
char name ## w3[((ASSYM_ABS(value) & 0xFFFF000000000000ULL) >> 48) + ASSYM_BIAS]
-
/* char name ## _datatype_ ## STRINGIFY(typeof(((struct parenttype *)(0x0))-> name)) [1]; */
#ifdef OFFSET_TEST
#define OFFSET_CTASSERT CTASSERT
Modified: head/sys/sys/ata.h
==============================================================================
--- head/sys/sys/ata.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/ata.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -384,7 +384,6 @@ struct ata_params {
#define ATA_SA600 0x49
#define ATA_DMA_MAX 0x4f
-
/* ATA commands */
#define ATA_NOP 0x00 /* NOP */
#define ATA_NF_FLUSHQUEUE 0x00 /* flush queued cmd's */
@@ -517,7 +516,6 @@ struct ata_params {
#define ATA_READ_NATIVE_MAX_ADDRESS 0xf8 /* read native max address */
#define ATA_SET_MAX_ADDRESS 0xf9 /* set max address */
-
/* ATAPI commands */
#define ATAPI_TEST_UNIT_READY 0x00 /* check if device is ready */
#define ATAPI_REZERO 0x01 /* rewind */
@@ -578,7 +576,6 @@ struct ata_params {
#define ATAPI_READ_CD 0xbe /* read data */
#define ATAPI_POLL_DSC 0xff /* poll DSC status bit */
-
struct ata_ioc_devices {
int channel;
char name[2][32];
@@ -629,7 +626,7 @@ struct atapi_sense {
u_int8_t specific; /* sense key specific */
#define ATA_SENSE_SPEC_VALID 0x80
#define ATA_SENSE_SPEC_MASK 0x7f
-
+
u_int8_t specific1; /* sense key specific */
u_int8_t specific2; /* sense key specific */
} __packed;
@@ -1008,7 +1005,6 @@ struct ata_security_password {
#define IOCATAGSPINDOWN _IOR('a', 104, int)
#define IOCATASSPINDOWN _IOW('a', 105, int)
-
struct ata_ioc_raid_config {
int lun;
Modified: head/sys/sys/blist.h
==============================================================================
--- head/sys/sys/blist.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/blist.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -102,4 +102,3 @@ void blist_resize(blist_t *pblist, daddr_t count, int
void blist_stats(blist_t blist, struct sbuf *s);
#endif /* _SYS_BLIST_H_ */
-
Modified: head/sys/sys/buf_ring.h
==============================================================================
--- head/sys/sys/buf_ring.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/buf_ring.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -197,12 +197,12 @@ buf_ring_dequeue_sc(struct buf_ring *br)
cons_head = br->br_cons_head;
#endif
prod_tail = atomic_load_acq_32(&br->br_prod_tail);
-
+
cons_next = (cons_head + 1) & br->br_cons_mask;
#ifdef PREFETCH_DEFINED
cons_next_next = (cons_head + 2) & br->br_cons_mask;
#endif
-
+
if (cons_head == prod_tail)
return (NULL);
@@ -238,10 +238,10 @@ buf_ring_advance_sc(struct buf_ring *br)
{
uint32_t cons_head, cons_next;
uint32_t prod_tail;
-
+
cons_head = br->br_cons_head;
prod_tail = br->br_prod_tail;
-
+
cons_next = (cons_head + 1) & br->br_cons_mask;
if (cons_head == prod_tail)
return;
@@ -297,7 +297,7 @@ buf_ring_peek(struct buf_ring *br)
*/
if (br->br_cons_head == br->br_prod_tail)
return (NULL);
-
+
return (br->br_ring[br->br_cons_head]);
}
@@ -366,7 +366,5 @@ buf_ring_count(struct buf_ring *br)
struct buf_ring *buf_ring_alloc(int count, struct malloc_type *type, int flags,
struct mtx *);
void buf_ring_free(struct buf_ring *br, struct malloc_type *type);
-
-
#endif
Modified: head/sys/sys/bus.h
==============================================================================
--- head/sys/sys/bus.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/bus.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -311,7 +311,7 @@ struct resource_map {
bus_size_t r_size;
void *r_vaddr;
};
-
+
/**
* @brief Optional properties of a resource mapping request.
*/
Modified: head/sys/sys/bus_dma_internal.h
==============================================================================
--- head/sys/sys/bus_dma_internal.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/bus_dma_internal.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -58,4 +58,3 @@ void _bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap
void *callback_arg);
#endif /* !_BUS_DMA_INTERNAL_H_ */
-
Modified: head/sys/sys/cdio.h
==============================================================================
--- head/sys/sys/cdio.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/cdio.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -108,7 +108,6 @@ struct cd_sub_channel_info {
} what;
};
-
/***************************************************************\
* Ioctls for the CD drive *
\***************************************************************/
@@ -121,14 +120,12 @@ struct ioc_play_track {
};
#define CDIOCPLAYTRACKS _IOW('c',1,struct ioc_play_track)
-
struct ioc_play_blocks {
int blk;
int len;
};
#define CDIOCPLAYBLOCKS _IOW('c',2,struct ioc_play_blocks)
-
struct ioc_read_subchannel {
u_char address_format;
#define CD_LBA_FORMAT 1
@@ -144,7 +141,6 @@ struct ioc_read_subchannel {
};
#define CDIOCREADSUBCHANNEL _IOWR('c', 3 , struct ioc_read_subchannel )
-
struct ioc_toc_header {
u_short len;
u_char starting_track;
@@ -152,7 +148,6 @@ struct ioc_toc_header {
};
#define CDIOREADTOCHEADER _IOR('c',4,struct ioc_toc_header)
-
struct ioc_read_toc_entry {
u_char address_format;
u_char starting_track;
@@ -161,7 +156,6 @@ struct ioc_read_toc_entry {
};
#define CDIOREADTOCENTRYS _IOWR('c',5,struct ioc_read_toc_entry)
-
struct ioc_read_toc_single_entry {
u_char address_format;
u_char track;
@@ -169,13 +163,11 @@ struct ioc_read_toc_single_entry {
};
#define CDIOREADTOCENTRY _IOWR('c',6,struct ioc_read_toc_single_entry)
-
struct ioc_patch {
u_char patch[4]; /* one for each channel */
};
#define CDIOCSETPATCH _IOW('c',9,struct ioc_patch)
-
struct ioc_vol {
u_char vol[4]; /* one for each channel */
};
@@ -210,7 +202,6 @@ struct ioc_vol {
#define CDIOCEJECT _IO('c',24)
-
struct ioc_play_msf {
u_char start_m;
u_char start_s;
@@ -229,7 +220,6 @@ struct ioc_play_msf {
/*<1>causes the drive to close its door*/
/*<1>and make the media (if any) ready*/
#define CDIOCCLOSE _IO('c',28) /*<1>*/
-
struct ioc_pitch { /*<1>For drives that support it, this*/
/*<1>call instructs the drive to play the*/
Modified: head/sys/sys/chio.h
==============================================================================
--- head/sys/sys/chio.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/chio.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -248,7 +248,6 @@ struct changer_element_status_request {
struct changer_element_status *cesr_element_status;
};
-
struct changer_set_voltag_request {
u_int16_t csvr_type;
u_int16_t csvr_addr;
@@ -263,7 +262,6 @@ struct changer_set_voltag_request {
changer_voltag_t csvr_voltag;
};
-
#define CESTATUS_BITS \
"\20\6INENAB\5EXENAB\4ACCESS\3EXCEPT\2IMPEXP\1FULL"
Modified: head/sys/sys/cnv.h
==============================================================================
--- head/sys/sys/cnv.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/cnv.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -75,7 +75,6 @@ int cnvlist_get_descriptor(const void *cookie);
const int *cnvlist_get_descriptor_array(const void *cookie, size_t *nitemsp);
#endif
-
/*
* The cnvlist_take functions returns value associated with the given cookie and
* remove the given entry from the nvlist.
Modified: head/sys/sys/conf.h
==============================================================================
--- head/sys/sys/conf.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/conf.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -272,7 +272,7 @@ struct make_dev_args {
void make_dev_args_init_impl(struct make_dev_args *_args, size_t _sz);
#define make_dev_args_init(a) \
make_dev_args_init_impl((a), sizeof(struct make_dev_args))
-
+
void delist_dev(struct cdev *_dev);
void destroy_dev(struct cdev *_dev);
int destroy_dev_sched(struct cdev *dev);
Modified: head/sys/sys/copyright.h
==============================================================================
--- head/sys/sys/copyright.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/copyright.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -27,7 +27,6 @@
* $FreeBSD$
*/
-
/* Copyrights macros */
/* Add a FreeBSD vendor copyright here */
Modified: head/sys/sys/disk.h
==============================================================================
--- head/sys/sys/disk.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/disk.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -63,7 +63,7 @@ void disk_err(struct bio *bp, const char *what, int bl
* Enable/Disable (the argument is boolean) the device for kernel
* core dumps.
*/
-
+
#define DIOCGFRONTSTUFF _IOR('d', 134, off_t)
/*
* Many disk formats have some amount of space reserved at the
Modified: head/sys/sys/domainset.h
==============================================================================
--- head/sys/sys/domainset.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/domainset.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -43,7 +43,6 @@
sizeof("::") + sizeof(__XSTRING(DOMAINSET_POLICY_MAX)) + \
sizeof(__XSTRING(MAXMEMDOM)))
-
#define DOMAINSET_CLR(n, p) BIT_CLR(DOMAINSET_SETSIZE, n, p)
#define DOMAINSET_COPY(f, t) BIT_COPY(DOMAINSET_SETSIZE, f, t)
#define DOMAINSET_ISSET(n, p) BIT_ISSET(DOMAINSET_SETSIZE, n, p)
Modified: head/sys/sys/endian.h
==============================================================================
--- head/sys/sys/endian.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/endian.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -39,22 +39,22 @@
typedef __uint8_t uint8_t;
#define _UINT8_T_DECLARED
#endif
-
+
#ifndef _UINT16_T_DECLARED
typedef __uint16_t uint16_t;
#define _UINT16_T_DECLARED
#endif
-
+
#ifndef _UINT32_T_DECLARED
typedef __uint32_t uint32_t;
#define _UINT32_T_DECLARED
#endif
-
+
#ifndef _UINT64_T_DECLARED
typedef __uint64_t uint64_t;
#define _UINT64_T_DECLARED
#endif
-
+
/*
* General byte order swapping functions.
*/
Modified: head/sys/sys/event.h
==============================================================================
--- head/sys/sys/event.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/event.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -230,7 +230,6 @@ struct knlist {
int kl_autodestroy;
};
-
#ifdef _KERNEL
/*
Modified: head/sys/sys/fail.h
==============================================================================
--- head/sys/sys/fail.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/fail.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -328,7 +328,6 @@ __END_DECLS
_FAIL_POINT_EVAL(name, true, code) \
} while (0)
-
/**
* Instantiate a failpoint which runs arbitrary code when triggered.
* @param parent The parent sysctl under which to locate the sysctl
Modified: head/sys/sys/fcntl.h
==============================================================================
--- head/sys/sys/fcntl.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/fcntl.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -327,7 +327,6 @@ struct __oflock {
#define POSIX_FADV_NOREUSE 5 /* access data only once */
#endif
-
#ifdef __BSD_VISIBLE
/*
* Magic value that specify that corresponding file descriptor to filename
Modified: head/sys/sys/fdcio.h
==============================================================================
--- head/sys/sys/fdcio.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/fdcio.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -125,7 +125,6 @@ enum fd_drivetype {
FDT_288M
};
-
#define FD_FORM _IOW('F', 61, struct fd_formb) /* format a track */
#define FD_GTYPE _IOR('F', 62, struct fd_type) /* get drive type */
#define FD_STYPE _IOW('F', 63, struct fd_type) /* set drive type */
Modified: head/sys/sys/imgact_aout.h
==============================================================================
--- head/sys/sys/imgact_aout.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/imgact_aout.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -70,7 +70,6 @@
N_GETMAGIC_NET(ex) != OMAGIC && N_GETMAGIC_NET(ex) != NMAGIC && \
N_GETMAGIC_NET(ex) != ZMAGIC && N_GETMAGIC_NET(ex) != QMAGIC)
-
/* Address of the bottom of the text segment. */
/*
* This can not be done right. Abuse a_entry in some cases to handle kernels.
Modified: head/sys/sys/intr.h
==============================================================================
--- head/sys/sys/intr.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/intr.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -44,7 +44,7 @@ enum intr_map_data_type {
INTR_MAP_DATA_FDT,
INTR_MAP_DATA_GPIO,
INTR_MAP_DATA_MSI,
-
+
/* Placeholders for platform specific types */
INTR_MAP_DATA_PLAT_1 = 1000,
INTR_MAP_DATA_PLAT_2,
Modified: head/sys/sys/iov.h
==============================================================================
--- head/sys/sys/iov.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/iov.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -256,4 +256,3 @@ struct pci_iov_arg
#define IOV_GET_SCHEMA _IOWR('p', 12, struct pci_iov_schema)
#endif
-
Modified: head/sys/sys/ipmi.h
==============================================================================
--- head/sys/sys/ipmi.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/ipmi.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -127,7 +127,6 @@ struct ipmi_cmdspec {
unsigned char cmd;
};
-
struct ipmi_addr {
int addr_type;
short channel;
Modified: head/sys/sys/kernel.h
==============================================================================
--- head/sys/sys/kernel.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/kernel.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -175,7 +175,6 @@ enum sysinit_sub_id {
SI_SUB_LAST = 0xfffffff /* final initialization */
};
-
/*
* Some enumerated orders; "ANY" sorts last.
*/
@@ -191,7 +190,6 @@ enum sysinit_elem_order {
SI_ORDER_MIDDLE = 0x1000000, /* somewhere in the middle */
SI_ORDER_ANY = 0xfffffff /* last*/
};
-
/*
* A system initialization call instance
Modified: head/sys/sys/kobj.h
==============================================================================
--- head/sys/sys/kobj.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/kobj.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -175,7 +175,6 @@ struct kobj_class classvar = { \
#name, methods, size, name ## _baseclasses \
}
-
/*
* Compile the method table in a class.
*/
@@ -252,7 +251,6 @@ extern u_int kobj_lookup_misses;
kobj_method_t* kobj_lookup_method(kobj_class_t cls,
kobj_method_t **cep,
kobjop_desc_t desc);
-
/*
* Default method implementation. Returns ENXIO.
Modified: head/sys/sys/kthread.h
==============================================================================
--- head/sys/sys/kthread.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/kthread.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -77,5 +77,4 @@ void kthread_start(const void *);
int kthread_suspend(struct thread *, int);
void kthread_suspend_check(void);
-
#endif /* !_SYS_KTHREAD_H_ */
Modified: head/sys/sys/libkern.h
==============================================================================
--- head/sys/sys/libkern.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/libkern.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -88,7 +88,6 @@ validbcd(int bcd)
return (bcd == 0 || (bcd > 0 && bcd <= 0x99 && bcd2bin_data[bcd] != 0));
}
-
static __inline int imax(int a, int b) { return (a > b ? a : b); }
static __inline int imin(int a, int b) { return (a < b ? a : b); }
static __inline long lmax(long a, long b) { return (a > b ? a : b); }
@@ -113,7 +112,6 @@ static __inline __uintmax_t ummin(__uintmax_t a, __uin
}
static __inline off_t omax(off_t a, off_t b) { return (a > b ? a : b); }
static __inline off_t omin(off_t a, off_t b) { return (a < b ? a : b); }
-
static __inline int abs(int a) { return (a < 0 ? -a : a); }
static __inline long labs(long a) { return (a < 0 ? -a : a); }
static __inline quad_t qabs(quad_t a) { return (a < 0 ? -a : a); }
Modified: head/sys/sys/linker.h
==============================================================================
--- head/sys/sys/linker.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/linker.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -193,7 +193,6 @@ int linker_search_symbol_name_flags(caddr_t value, cha
int linker_search_symbol_name(caddr_t value, char *buf, u_int buflen,
long *offset);
-
/* HWPMC helper */
void *linker_hwpmc_list_objects(void);
Modified: head/sys/sys/lock.h
==============================================================================
--- head/sys/sys/lock.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/lock.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -137,7 +137,6 @@ struct lock_class {
#define LOCK_LOG_TEST(lo, flags) 0
#endif
-
#define LOCK_LOG_LOCK(opname, lo, flags, recurse, file, line) do { \
if (LOCK_LOG_TEST((lo), (flags))) \
CTR6(KTR_LOCK, opname " (%s) %s %p r = %d at %s:%d", \
Modified: head/sys/sys/lock_profile.h
==============================================================================
--- head/sys/sys/lock_profile.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/lock_profile.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -29,7 +29,6 @@
* $FreeBSD$
*/
-
#ifndef _SYS_LOCK_PROFILE_H_
#define _SYS_LOCK_PROFILE_H_
@@ -51,7 +50,6 @@ void lock_profile_obtain_lock_success(struct lock_obje
uint64_t waittime, const char *file, int line);
void lock_profile_release_lock(struct lock_object *lo);
void lock_profile_thread_exit(struct thread *td);
-
static inline void
lock_profile_obtain_lock_failed(struct lock_object *lo, int *contested,
Modified: head/sys/sys/lockstat.h
==============================================================================
--- head/sys/sys/lockstat.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/lockstat.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -26,7 +26,7 @@
*
* $FreeBSD$
*/
-
+
/*
* DTrace lockstat provider definitions
*/
Modified: head/sys/sys/mtio.h
==============================================================================
--- head/sys/sys/mtio.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/mtio.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -174,7 +174,7 @@ struct scsi_tape_errors {
u_int64_t nbytes; /* total # bytes processed */
} wterr, rderr;
};
-
+
union mterrstat {
struct scsi_tape_errors scsi_errstat;
char _reserved_padding[256];
@@ -239,7 +239,6 @@ struct mtextget {
#define MT_DENS_WRITE_OK 0x80
#define MT_DENS_DUP 0x40
#define MT_DENS_DEFLT 0x20
-
#define MT_PARAM_FIXED_STR_LEN 32
union mt_param_value {
Modified: head/sys/sys/pmc.h
==============================================================================
--- head/sys/sys/pmc.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/pmc.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -356,14 +356,12 @@ enum pmc_event {
__PMC_OP(CLOSELOG, "Close log file") \
__PMC_OP(GETDYNEVENTINFO, "Get dynamic events list")
-
enum pmc_ops {
#undef __PMC_OP
#define __PMC_OP(N, D) PMC_OP_##N,
__PMC_OPS()
};
-
/*
* Flags used in operations on PMCs.
*/
@@ -414,7 +412,6 @@ typedef uint64_t pmc_value_t;
* number of hardware PMCs on this cpu.
*/
-
#define PMC_ID_TO_ROWINDEX(ID) ((ID) & 0xFF)
#define PMC_ID_TO_CLASS(ID) (((ID) & 0xF00) >> 8)
#define PMC_ID_TO_MODE(ID) (((ID) & 0xFF000) >> 12)
@@ -487,7 +484,6 @@ struct pmc_op_pmcsetcount {
pmc_id_t pm_pmcid; /* PMC id to set */
};
-
/*
* OP PMCRW
*
@@ -495,14 +491,12 @@ struct pmc_op_pmcsetcount {
* to have been previously allocated using PMCALLOCATE.
*/
-
struct pmc_op_pmcrw {
uint32_t pm_flags; /* PMC_F_{OLD,NEW}VALUE*/
pmc_id_t pm_pmcid; /* pmc id */
pmc_value_t pm_value; /* new&returned value */
};
-
/*
* OP GETPMCINFO
*
@@ -528,14 +522,12 @@ struct pmc_op_getpmcinfo {
struct pmc_info pm_pmcs[]; /* space for 'npmc' structures */
};
-
/*
* OP GETCPUINFO
*
* Retrieve system CPU information.
*/
-
struct pmc_classinfo {
enum pmc_class pm_class; /* class id */
uint32_t pm_caps; /* counter capabilities */
@@ -1000,7 +992,6 @@ struct pmc_binding {
int pb_cpu; /* if so, to which CPU */
};
-
struct pmc_mdep;
/*
@@ -1137,7 +1128,7 @@ extern struct pmc_debugflags pmc_debugflags;
CTR6(KTR_PMC, #M ":" #N ":" #L ": " F, p1, p2, p3, p4, \
p5, p6); \
} while (0)
-
+
/* Major numbers */
#define PMC_DEBUG_MAJ_CPU 0 /* cpu switches */
#define PMC_DEBUG_MAJ_CSW 1 /* context switches */
Modified: head/sys/sys/posix4.h
==============================================================================
--- head/sys/sys/posix4.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/posix4.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -55,7 +55,6 @@ int sys_ ## SC (struct thread *td, struct SC##_args *u
return syscall_not_present(td, #SC , (struct nosys_args *)uap); \
}
-
MALLOC_DECLARE(M_P31B);
int p31b_proc(struct proc *, pid_t, struct proc **);
@@ -75,7 +74,6 @@ void p31b_unsetcfg(int);
*/
enum ksched_op {
-
#define KSCHED_OP_RW { 1, 0, 1, 0, 0, 0, 0, 0 }
SCHED_SETPARAM,
Modified: head/sys/sys/power.h
==============================================================================
--- head/sys/sys/power.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/power.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -64,4 +64,3 @@ typedef void (*power_profile_change_hook)(void *, int)
EVENTHANDLER_DECLARE(power_profile_change, power_profile_change_hook);
#endif /* !_SYS_POWER_H_ */
-
Modified: head/sys/sys/proc.h
==============================================================================
--- head/sys/sys/proc.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/proc.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -859,7 +859,6 @@ extern pid_t pid_max;
#define SESS_LEADER(p) ((p)->p_session->s_leader == (p))
-
/* Lock and unlock a process. */
#define PROC_LOCK(p) mtx_lock(&(p)->p_mtx)
#define PROC_TRYLOCK(p) mtx_trylock(&(p)->p_mtx)
Modified: head/sys/sys/queue.h
==============================================================================
--- head/sys/sys/queue.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/queue.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -437,7 +437,6 @@ struct { \
(head2)->stqh_last = &STAILQ_FIRST(head2); \
} while (0)
-
/*
* List declarations.
*/
Modified: head/sys/sys/random.h
==============================================================================
--- head/sys/sys/random.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/random.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -153,7 +153,6 @@ void random_harvest_deregister_source(enum random_entr
#define random_harvest_queue_ether(a, b) do {} while (0)
#endif /* defined(RANDOM_ENABLE_ETHER) */
-
#endif /* _KERNEL */
#define GRND_NONBLOCK 0x1
Modified: head/sys/sys/rwlock.h
==============================================================================
--- head/sys/sys/rwlock.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/rwlock.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -209,7 +209,6 @@ void __rw_assert(const volatile uintptr_t *c, int what
__rw_assert(&(rw)->rw_lock, w, f, l)
#endif
-
/*
* Public interface for lock operations.
*/
Modified: head/sys/sys/serial.h
==============================================================================
--- head/sys/sys/serial.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/serial.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -35,7 +35,6 @@
#ifndef _SYS_SERIAL_H_
#define _SYS_SERIAL_H_
-
/*
* Indentification of modem control signals. These definitions match
* the TIOCMGET definitions in <sys/ttycom.h> shifted a bit down, and
Modified: head/sys/sys/socket.h
==============================================================================
--- head/sys/sys/socket.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/socket.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -73,7 +73,7 @@ typedef __sa_family_t sa_family_t;
typedef __socklen_t socklen_t;
#define _SOCKLEN_T_DECLARED
#endif
-
+
#ifndef _SSIZE_T_DECLARED
typedef __ssize_t ssize_t;
#define _SSIZE_T_DECLARED
@@ -618,7 +618,6 @@ struct omsghdr {
#define PRU_FLUSH_WR SHUT_WR
#define PRU_FLUSH_RDWR SHUT_RDWR
#endif
-
#if __BSD_VISIBLE
/*
Modified: head/sys/sys/sockopt.h
==============================================================================
--- head/sys/sys/sockopt.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/sockopt.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -39,7 +39,6 @@
#error "no user-serviceable parts inside"
#endif
-
struct thread;
struct socket;
Modified: head/sys/sys/soundcard.h
==============================================================================
--- head/sys/sys/soundcard.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/soundcard.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -802,7 +802,6 @@ typedef struct {
#define SNDCTL_DSP_SUBDIVIDE _IOWR('P', 9, int)
#define SNDCTL_DSP_SETFRAGMENT _IOWR('P',10, int)
-
#define SNDCTL_DSP_GETFMTS _IOR ('P',11, int) /* Returns a mask */
/*
* Buffer status queries.
@@ -1046,7 +1045,6 @@ typedef struct copr_msg {
#define SOUND_MIXER_RADIO 23 /* Radio in */
#define SOUND_MIXER_MONITOR 24 /* Monitor (usually mic) volume */
-
/*
* Some on/off settings (SOUND_SPECIAL_MIN - SOUND_SPECIAL_MAX)
* Not counted to SOUND_MIXER_NRDEVICES, but use the same number space
@@ -1420,7 +1418,6 @@ void seqbuf_dump(void); /* This function must be provi
#define SEQ_BENDER(dev, chn, value) \
_CHN_COMMON(dev, MIDI_PITCH_BEND, chn, 0, 0, value)
-
#define SEQ_V2_X_CONTROL(dev, voice, controller, value) { \
_SEQ_NEEDBUF(8);\
_seqbuf[_seqbufptr] = SEQ_EXTENDED;\
@@ -1595,7 +1592,6 @@ typedef struct audio_errinfo
#define SNDCTL_DSP_GETPLAYVOL _IOR ('P', 24, int)
#define SNDCTL_DSP_SETPLAYVOL _IOWR('P', 24, int)
#define SNDCTL_DSP_GETERROR _IOR ('P', 25, audio_errinfo)
-
/*
****************************************************************************
Modified: head/sys/sys/stats.h
==============================================================================
--- head/sys/sys/stats.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/stats.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -557,7 +557,6 @@ extern const struct voistatdata_numeric numeric_limits
#define STATS_VSS_DVHIST64_USR(vals, vsdflags) \
STATS_VSS_HIST(VSD_DTYPE_DVHIST64, HIST_HLPR_INFO(VSD_DTYPE_DVHIST64, \
BKT_USR, vsdflags, 0, 0, HIST_HLPR_INFO_USR_FIELDS(vals)))
-
#define DRBKT(lb, ub) { stats_ctor_vsd_numeric(lb), stats_ctor_vsd_numeric(ub) }
#define DVBKT(val) DRBKT(val, val)
#define CRBKT(lb) DRBKT(lb, lb)
@@ -583,7 +582,7 @@ extern const struct voistatdata_numeric numeric_limits
VSD_HIST_FIELD(hist, , hist_dtype, (void *)&,field)
#define VSD_CONSTHIST_FIELDPTR(hist, hist_dtype, field) \
VSD_HIST_FIELD(hist, const, hist_dtype, (void *)&,field)
-
+
#define VSD_CRHIST_FIELD(hist, cnst, hist_dtype, op, field) \
(VSD_DTYPE_CRHIST32 == (hist_dtype) ? \
op(_VSD(cnst, crhist32, hist)->field) : \
Modified: head/sys/sys/stdatomic.h
==============================================================================
--- head/sys/sys/stdatomic.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/stdatomic.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -373,7 +373,6 @@ __extension__ ({ \
typedef struct {
atomic_bool __flag;
} atomic_flag;
-
#define ATOMIC_FLAG_INIT { ATOMIC_VAR_INIT(0) }
static __inline _Bool
Modified: head/sys/sys/sysproto.h
==============================================================================
--- head/sys/sys/sysproto.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/sysproto.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -2404,7 +2404,6 @@ int ogetdirentries(struct thread *, struct ogetdirentr
#endif /* COMPAT_43 */
-
#ifdef COMPAT_FREEBSD4
struct freebsd4_getfsstat_args {
@@ -2465,7 +2464,6 @@ int freebsd4_sigreturn(struct thread *, struct freebsd
#endif /* COMPAT_FREEBSD4 */
-
#ifdef COMPAT_FREEBSD6
struct freebsd6_pread_args {
@@ -2531,7 +2529,6 @@ int freebsd6_lio_listio(struct thread *, struct freebs
#endif /* COMPAT_FREEBSD6 */
-
#ifdef COMPAT_FREEBSD7
struct freebsd7___semctl_args {
@@ -2556,14 +2553,12 @@ int freebsd7_shmctl(struct thread *, struct freebsd7_s
#endif /* COMPAT_FREEBSD7 */
-
#ifdef COMPAT_FREEBSD10
int freebsd10_pipe(struct thread *, struct freebsd10_pipe_args *);
#endif /* COMPAT_FREEBSD10 */
-
#ifdef COMPAT_FREEBSD11
struct freebsd11_mknod_args {
@@ -2670,7 +2665,6 @@ int freebsd11_fstatat(struct thread *, struct freebsd1
int freebsd11_mknodat(struct thread *, struct freebsd11_mknodat_args *);
#endif /* COMPAT_FREEBSD11 */
-
#ifdef COMPAT_FREEBSD12
Modified: head/sys/sys/systm.h
==============================================================================
--- head/sys/sys/systm.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/systm.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -167,7 +167,7 @@ void kassert_panic(const char *fmt, ...) __printflike
*/
#define CRITICAL_ASSERT(td) \
KASSERT((td)->td_critnest >= 1, ("Not in critical section"));
-
+
/*
* If we have already panic'd and this is the thread that called
* panic(), then don't block on any mutexes but silently succeed.
@@ -268,7 +268,6 @@ void tablefull(const char *);
extern int (*lkpi_alloc_current)(struct thread *, int);
int linux_alloc_current_noop(struct thread *, int);
-
#if defined(KLD_MODULE) || defined(KTR_CRITICAL) || !defined(_KERNEL) || defined(GENOFFSET)
#define critical_enter() critical_enter_KBI()
#define critical_exit() critical_exit_KBI()
@@ -300,7 +299,6 @@ critical_exit(void)
}
#endif
-
#ifdef EARLY_PRINTF
typedef void early_putc_t(int ch);
extern early_putc_t *early_putc;
@@ -564,7 +562,6 @@ struct root_hold_token *root_mount_hold(const char *id
void root_mount_hold_token(const char *identifier, struct root_hold_token *h);
void root_mount_rel(struct root_hold_token *h);
int root_mounted(void);
-
/*
* Unit number allocation API. (kern/subr_unit.c)
Modified: head/sys/sys/tiio.h
==============================================================================
--- head/sys/sys/tiio.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/tiio.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -268,7 +268,6 @@ struct tg_mem {
int len;
};
-
typedef enum {
TI_PARAM_NONE = 0x00,
TI_PARAM_STAT_TICKS = 0x01,
Modified: head/sys/sys/tim_filter.h
==============================================================================
--- head/sys/sys/tim_filter.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/tim_filter.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -102,7 +102,6 @@ get_cur_timelim(struct time_filter *tf)
return(tf->cur_time_limit);
}
-
int setup_time_filter_small(struct time_filter_small *tf,
int fil_type, uint32_t time_len);
void reset_time_small(struct time_filter_small *tf, uint32_t time_len);
@@ -128,7 +127,6 @@ get_cur_timelim_small(struct time_filter_small *tf)
{
return(tf->cur_time_limit);
}
-
#endif
#endif
Modified: head/sys/sys/timeet.h
==============================================================================
--- head/sys/sys/timeet.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/timeet.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -105,4 +105,3 @@ int et_free(struct eventtimer *et);
SYSCTL_DECL(_kern_eventtimer);
#endif
#endif /* !_SYS_TIMETC_H_ */
-
Modified: head/sys/sys/timepps.h
==============================================================================
--- head/sys/sys/timepps.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/timepps.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -81,7 +81,6 @@ typedef struct {
#define assert_offset_ntpfp assert_off_tu.ntpfp
#define clear_offset_ntpfp clear_off_tu.ntpfp
-
#define PPS_CAPTUREASSERT 0x01
#define PPS_CAPTURECLEAR 0x02
#define PPS_CAPTUREBOTH 0x03
Modified: head/sys/sys/tree.h
==============================================================================
--- head/sys/sys/tree.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/tree.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -99,7 +99,7 @@ struct { \
SPLAY_RIGHT(tmp, field) = (head)->sph_root; \
(head)->sph_root = tmp; \
} while (/*CONSTCOND*/ 0)
-
+
#define SPLAY_ROTATE_LEFT(head, tmp, field) do { \
SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field); \
SPLAY_LEFT(tmp, field) = (head)->sph_root; \
@@ -459,7 +459,6 @@ struct { \
RB_GENERATE_PREV(name, type, field, attr) \
RB_GENERATE_MINMAX(name, type, field, attr) \
RB_GENERATE_REINSERT(name, type, field, cmp, attr)
-
#define RB_GENERATE_INSERT_COLOR(name, type, field, attr) \
attr void \
Modified: head/sys/sys/vnode.h
==============================================================================
--- head/sys/sys/vnode.h Tue Sep 1 22:12:32 2020 (r365222)
+++ head/sys/sys/vnode.h Tue Sep 1 22:12:58 2020 (r365223)
@@ -522,7 +522,6 @@ extern struct vnodeop_desc *vnodeop_descs[];
#define VOPARG_OFFSETTO(s_type, s_offset, struct_p) \
((s_type)(((char*)(struct_p)) + (s_offset)))
-
#ifdef DEBUG_VFS_LOCKS
/*
* Support code to aid in debugging VFS locking problems. Not totally
@@ -569,7 +568,6 @@ void assert_vop_unlocked(struct vnode *vp, const char
#define ASSERT_VOP_NOT_IN_SEQC(vp) ((void)0)
#endif /* DEBUG_VFS_LOCKS */
-
/*
* This call works for vnodes in the kernel.
More information about the svn-src-all
mailing list